aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--benchmarking/docker/Dockerfile2
-rw-r--r--healthcheck/docker/Dockerfile2
-rw-r--r--infra-healthcheck/docker/Dockerfile4
-rw-r--r--security/docker/Dockerfile4
-rw-r--r--smoke-usecases-pythonsdk/docker/Dockerfile2
-rw-r--r--smoke-usecases-robot-py3/docker/Dockerfile2
-rw-r--r--smoke-usecases-robot/docker/Dockerfile2
7 files changed, 9 insertions, 9 deletions
diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile
index 2e5f653..ad3721f 100644
--- a/benchmarking/docker/Dockerfile
+++ b/benchmarking/docker/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/xtesting:wallaby
ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
-ARG ONAP_TAG=master
+ARG ONAP_TAG=jakarta
ARG PIP_TAG=20.1
ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index 3ca0f00..db0381c 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=jakarta
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..3352d90 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=jakarta
+ARG ONAP_TAG=jakarta
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index 89a04c5..d0432cb 100644
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -15,8 +15,8 @@ RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"'
FROM opnfv/xtesting:wallaby AS run
ARG KUBERNETES_VERSION="v1.19.11"
-ARG ONAP_TAG=master
-ARG ONAP_TESTS_TAG=master
+ARG ONAP_TAG=jakarta
+ARG ONAP_TESTS_TAG=jakarta
# Install kubectl
# Note: Latest version may be found on:
diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile
index 08a0373..ca4bd01 100644
--- a/smoke-usecases-pythonsdk/docker/Dockerfile
+++ b/smoke-usecases-pythonsdk/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM opnfv/xtesting:wallaby as pythonsdk-release
MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
-ARG ONAP_TESTS_TAG=master
+ARG ONAP_TESTS_TAG=jakarta
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..d4fe543 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=jakarta
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..1ed6349 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=jakarta
ARG PIP_TAG=20.1
ARG KUBERNETES_VERSION="v1.19.9"
ARG HELM_VERSION="v3.3.4"