aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-08-13 15:23:42 +0200
committermrichomme <morgan.richomme@orange.com>2020-08-13 17:05:54 +0200
commite98cb30e40b01b0dfcaa0a36140abed6e3c8082f (patch)
tree9a5fdb9065ee4e5bddea99534a989ced0e7ee82c
parent5b9be7b454026ec622ed47ffa361885b7fb0ef01 (diff)
Align xtesting versions for frankfurt
Use ONAP frankfurt code to generate frankfurt xtesting dockers Issue-ID: INT-1683 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I1a95148c1f2356d64409ad889bc43c487fe17917 Signed-off-by: mrichomme <morgan.richomme@orange.com>
-rw-r--r--benchmarking/docker/Dockerfile2
-rw-r--r--candidate-usecases/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/docker/Dockerfile2
7 files changed, 9 insertions, 9 deletions
diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile
index 4206b4c..deed408 100644
--- a/benchmarking/docker/Dockerfile
+++ b/benchmarking/docker/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/xtesting
ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
-ARG ONAP_TAG=master
+ARG ONAP_TAG=frankfurt
ARG PIP_TAG=19.3.1
ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
diff --git a/candidate-usecases/docker/Dockerfile b/candidate-usecases/docker/Dockerfile
index b6dae67..6b95d51 100644
--- a/candidate-usecases/docker/Dockerfile
+++ b/candidate-usecases/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/xtesting
MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
-ARG ONAP_TESTS_TAG=master
+ARG ONAP_TESTS_TAG=frankfurt
RUN apk add --no-cache python3 git bash && \
apk add --no-cache --virtual .build-deps libffi-dev python3-dev \
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index bcaf378..31ad0d9 100644
--- a/healthcheck/docker/Dockerfile
+++ b/healthcheck/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/xtesting:jerma
ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
-ARG ONAP_TAG=master
+ARG ONAP_TAG=frankfurt
ARG PIP_TAG=19.3.1
ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index 87d177c..cca1d97 100644
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -2,8 +2,8 @@ FROM opnfv/xtesting
ARG KUBERNETES_VERSION="v1.15.11"
ARG HELM_VERSION="v2.16.6"
-ARG ONAP_TESTS_TAG=master
-ARG ONAP_TAG=master
+ARG ONAP_TESTS_TAG=frankfurt
+ARG ONAP_TAG=frankfurt
# Install kubectl
# Note: Latest version may be found on:
diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index e38f565..19023df 100644
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -14,8 +14,8 @@ FROM opnfv/xtesting AS run
ARG KUBERNETES_VERSION="v1.15.2"
ARG HELM_VERSION="v2.14.1"
-ARG ONAP_TAG=master
-ARG ONAP_TESTS_TAG=master
+ARG ONAP_TAG=frankfurt
+ARG ONAP_TESTS_TAG=frankfurt
# Install kubectl
# Note: Latest version may be found on:
diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile
index b6dae67..6b95d51 100644
--- a/smoke-usecases-pythonsdk/docker/Dockerfile
+++ b/smoke-usecases-pythonsdk/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/xtesting
MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
-ARG ONAP_TESTS_TAG=master
+ARG ONAP_TESTS_TAG=frankfurt
RUN apk add --no-cache python3 git bash && \
apk add --no-cache --virtual .build-deps libffi-dev python3-dev \
diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile
index 5a614c0..68f24db 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=master
ARG OPNFV_TAG=master
-ARG ONAP_TAG=master
+ARG ONAP_TAG=frankfurt
ARG PIP_TAG=20.1
ARG KUBERNETES_VERSION="v1.15.11"