diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-25 18:43:04 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-25 20:53:00 +0200 |
| commit | a6fd2fef7a8843706bde9e5f73e0a74d48bd361c (patch) | |
| tree | 3def08b58aa1831379bfcf755522bb6d5987dc1d | |
| parent | 253e17d5b10965758465b08c7d13589c4ff7d0cf (diff) | |
Fix tags in Functest smoke
Change-Id: I3ac85a0e29ab831e3900e3566fa7178d27b4f028
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 28 |
2 files changed, 15 insertions, 14 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index b9309ec47..2a7fc75c7 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -25,6 +25,7 @@ RUN apk -U upgrade && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \ git checkout FETCH_HEAD) && \ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \ + sed -i -E /^neutron=/d /src/requirements/upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \ sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \ pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 56933b1f7..4c5ed365d 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,19 +1,19 @@ FROM opnfv/functest-core:yoga -ARG PATROLE_TAG=master -ARG NEUTRON_TEMPEST_TAG=master -ARG CINDER_TEMPEST_TAG=master -ARG KEYSTONE_TEMPEST_TAG=master -ARG NEUTRON_TAG=master -ARG GLANCE_TAG=master -ARG NOVA_TAG=master -ARG KEYSTONE_TAG=master -ARG CINDER_TAG=master -ARG BARBICAN_TAG=master -ARG OCTAVIA_TAG=master -ARG HEAT_TEMPEST_TAG=master -ARG TELEMETRY_TEMPEST_TAG=master -ARG CYBORG_TEMPEST_TAG=master +ARG PATROLE_TAG=0.14.0 +ARG NEUTRON_TEMPEST_TAG=1.9.0 +ARG CINDER_TEMPEST_TAG=1.6.0 +ARG KEYSTONE_TEMPEST_TAG=0.9.0 +ARG NEUTRON_TAG=stable/yoga +ARG GLANCE_TAG=stable/yoga +ARG NOVA_TAG=stable/yoga +ARG KEYSTONE_TAG=stable/yoga +ARG CINDER_TAG=stable/yoga +ARG BARBICAN_TAG=1.6.0 +ARG OCTAVIA_TAG=1.9.0 +ARG HEAT_TEMPEST_TAG=1.5.0 +ARG TELEMETRY_TEMPEST_TAG=1.6.0 +ARG CYBORG_TEMPEST_TAG=1.4.0 RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ |