summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2022-08-31 15:33:33 +0200
committerMichael Dürre <michael.duerre@highstreet-technologies.com>2022-09-01 07:17:06 +0200
commitecce726c43debe0b3c1e3225cfb4f1936672be13 (patch)
treea5e05b40ea22087b76124f7e197078ffcf97e332
parenta2471df77eaf8f6135c29cbe47617f152a3ffe05 (diff)
fix odl sulfur aaa artifact
add missing fix for aaa Issue-ID: CCSDK-3750 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com> Change-Id: I686c119af7d80b5b770d37dbc63bb7483c85b208 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
-rw-r--r--docs/tox.ini6
-rw-r--r--opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/tox.ini b/docs/tox.ini
index 811bb5e8..fa971f20 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -4,10 +4,10 @@ envlist = docs
skipsdist = true
[testenv:docs]
-basepython = python3
+basepython = python3.8
deps =
-r{toxinidir}/requirements-docs.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
-chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
@@ -18,7 +18,7 @@ whitelist_externals =
sh
[testenv:docs-linkcheck]
-basepython = python3
+basepython = python3.8
deps =
-r{toxinidir}/requirements-docs.txt
-chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
diff --git a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
index 4201b83e..15b17d80 100644
--- a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@ RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL
&& addgroup odl wheel
# Patch some opendaylight artifacts
-#COPY system $ODL_HOME/system
+COPY system $ODL_HOME/system
# Add missing scripts see SDNC-1056
#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/