diff options
| author |   morganrol <morgan.richomme@orange.com> | 2022-01-18 08:56:23 +0100 |
|---|---|---|
| committer | morganrol <morgan.richomme@orange.com> | 2022-01-18 08:56:23 +0100 |
| commit | f0b34e8a3b3a6f2cc55dbcb7c4f3e16f55bb7dbd (patch) | |
| tree | fb47a42e1dfe2b69af936f90378df6576940cd09 | |
| parent | e2ead51a287831c6be8c89a1969564e760cff5fa (diff) | |
[ISTANBUL] Use integration istanbul branches for istanbul xtesting dockers
xtesting dockers have been released for istanbul (1.9.0)
but istanbul dockers are still rebuilt daily in jenkins.
I forgot to specify the branch of testsuite and integration
as a consequence daily istanbul xtesting dockers are using the master
branch. It explains why some istanbul tests look like master.
Some changes (DCAE refactoring) requires the istanbul version.
This patch just set properly the istanbul branch when building the dockers
Issue-ID: INT-2044
Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I7a96cb8ed79fc0358bfd9f82fc186fd1dd98a9c4
| -rw-r--r-- | healthcheck/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | smoke-usecases-pythonsdk/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | smoke-usecases-robot-py3/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | smoke-usecases-robot/docker/Dockerfile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index 3ca0f00..c450bc9 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -3,7 +3,7 @@ FROM opnfv/xtesting:jerma ARG OPENSTACK_TAG=stable/wallaby ARG PIP_TAG=20.1 ARG OPNFV_TAG=stable/jerma -ARG ONAP_TAG=master +ARG ONAP_TAG=istanbul ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index 24fa61d..4535dd1 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -3,8 +3,8 @@ FROM opnfv/xtesting:wallaby ARG KUBERNETES_VERSION="v1.19.11" ARG HELM_VERSION="v2.16.6" ARG HELM3_VERSION="v3.3.4" -ARG ONAP_TESTS_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TESTS_TAG=istanbul +ARG ONAP_TAG=istanbul ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index 696862a..a501ff5 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/xtesting:wallaby MAINTAINER Morgan Richomme <morgan.richomme@orange.com> -ARG ONAP_TESTS_TAG=master +ARG ONAP_TESTS_TAG=istanbul ARG ONAPSDK_PYTHON_PATH=/src/onapsdk ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 diff --git a/smoke-usecases-robot-py3/docker/Dockerfile b/smoke-usecases-robot-py3/docker/Dockerfile index 1caf0f5..1686b95 100644 --- a/smoke-usecases-robot-py3/docker/Dockerfile +++ b/smoke-usecases-robot-py3/docker/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TAG=istanbul ARG PIP_TAG=21.2.4 ARG KUBERNETES_VERSION="v1.19.9" diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index 0c6855a..c1c412e 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=stable/wallaby ARG OPNFV_TAG=stable/jerma -ARG ONAP_TAG=master +ARG ONAP_TAG=istanbul ARG PIP_TAG=20.1 ARG KUBERNETES_VERSION="v1.19.9" ARG HELM_VERSION="v3.3.4" |