Prepare Functest euphrates containers

They depend on git commit ids for the next OPNFV projects:
  - releng [1]
  - securityscanning

Securityscanning should be first removed in master and then the patch
will be cherry-picked in stable/euphrates. A temporarily git commit
id is used here to allow building the containers before that changes.

[1] https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-September/017865.html

Change-Id: Ib7bd4206a6ef7f5bb8cd58f324d3e437a3b704a1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/build.sh b/build.sh
index 18d2e58..e4d9b6a 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -14,11 +14,11 @@ docker/parser \
 docker/restapi"
 
 (cd docker && docker build -t "${repo}/functest" .)
-docker push "${repo}/functest"
+docker push "${repo}/functest:euphrates"
 
 for dir in ${dirs}; do
-    (cd ${dir} && docker build -t "${repo}/functest-${dir##**/}" .)
-    docker push "${repo}/functest-${dir##**/}"
+    (cd ${dir} && docker build -t "${repo}/functest-${dir##**/}:euphrates" .)
+    docker push "${repo}/functest-${dir##**/}:euphrates"
 done
 
 exit $?

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 218d744..5d934df 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
 LABEL version="0.1" description="OPNFV Functest Docker container"
 
 # Environment variables
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG RALLY_TAG=stable/0.9
 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
 ARG OPENSTACK_TAG=stable/ocata

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 8923e4c..8794f78 100644 (file)
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 04e3259..75180f9 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG OPENSTACK_TAG=stable/ocata
 ARG RALLY_TAG=stable/0.9
 

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 8b0a2f6..f20c586 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG OPENSTACK_TAG=stable/ocata
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 8923e4c..8794f78 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]

diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index a28a1f5..43bd0ad 100644 (file)
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG OPENSTACK_TAG=stable/pike
 ARG RALLY_TAG=stable/0.9
 

diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 2c75602..23adcc8 100644 (file)
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -1,9 +1,9 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG OPENSTACK_TAG=stable/ocata
 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
-ARG FDS_TAG=master
+ARG FDS_TAG=stable/euphrates
 ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
 ARG VIMS_TAG=stable
 

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index fe2f919..8204384 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,9 +1,9 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
 ARG OPENSTACK_TAG=stable/ocata
 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
-ARG FDS_TAG=master
+ARG FDS_TAG=stable/euphrates
 ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
 
 RUN apk --no-cache add --virtual .build-deps --update \

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 36e80d7..5203855 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
 
 ARG VIMS_TAG=stable
 

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 62a460a..70b9d1f 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,12 +1,12 @@
-git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
-git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
-git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
-git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
-git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
-git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
--e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise
--e git+https://gerrit.opnfv.org/gerrit/doctor#egg=doctor-test
-git+https://gerrit.opnfv.org/gerrit/domino#egg=domino
+git+https://gerrit.opnfv.org/gerrit/releng@1fc5d49f8aa9eb44e615afdd597827be48cf517a#egg=opnfv&subdirectory=modules
+git+https://gerrit.opnfv.org/gerrit/snaps@stable/euphrates#egg=snaps
+git+https://gerrit.opnfv.org/gerrit/barometer@stable/euphrates#egg=baro_tests
+git+https://gerrit.opnfv.org/gerrit/sdnvpn@stable/euphrates#egg=sdnvpn
+git+https://gerrit.opnfv.org/gerrit/securityscanning@d09a8eb8b28056e2ec02ed627d337a7c7f86e23e#egg=securityscanning
+git+https://gerrit.opnfv.org/gerrit/sfc@stable/euphrates#egg=sfc
+-e git+https://gerrit.opnfv.org/gerrit/promise@stable/euphrates#egg=promise
+-e git+https://gerrit.opnfv.org/gerrit/doctor@stable/euphrates#egg=doctor-test
+git+https://gerrit.opnfv.org/gerrit/domino@stable/euphrates#egg=domino
 cloudify-rest-client===4.0
 iniparse===0.4
 openbaton-cli===2.2.1b7