summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitreview2
-rw-r--r--.travis.yml36
-rw-r--r--build.sh20
-rw-r--r--docker/components/Dockerfile4
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/parser/Dockerfile4
-rw-r--r--docker/restapi/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile4
-rw-r--r--docker/vnf/Dockerfile4
-rw-r--r--upper-constraints.txt4
12 files changed, 45 insertions, 45 deletions
diff --git a/.gitreview b/.gitreview
index e59fef8d9..e7dbf4828 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
host=gerrit.opnfv.org
port=29418
project=functest.git
-
+defaultbranch=stable/fraser
diff --git a/.travis.yml b/.travis.yml
index cc8385855..f7589373f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ jobs:
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-core:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-core:latest
+ --template ${DOCKER_USERNAME}/functest-core:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-core:fraser
- stage: build all functest images
script: sudo -E bash build.sh
env:
@@ -93,40 +93,40 @@ jobs:
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-healthcheck:latest
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-healthcheck:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-healthcheck:latest
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-healthcheck:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-smoke:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-smoke:latest
+ --template ${DOCKER_USERNAME}/functest-smoke:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-smoke:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-features:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-features:latest
+ --template ${DOCKER_USERNAME}/functest-features:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-features:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-components:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-components:latest
+ --template ${DOCKER_USERNAME}/functest-components:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-components:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-vnf:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-vnf:latest
+ --template ${DOCKER_USERNAME}/functest-vnf:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-vnf:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-restapi:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-restapi:latest
+ --template ${DOCKER_USERNAME}/functest-restapi:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-restapi:fraser
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-parser:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-parser:latest
+ --template ${DOCKER_USERNAME}/functest-parser:ARCH-fraser \
+ --target ${DOCKER_USERNAME}/functest-parser:fraser
diff --git a/build.sh b/build.sh
index 7074d8c5a..6e8313dd9 100644
--- a/build.sh
+++ b/build.sh
@@ -16,23 +16,23 @@ docker/restapi"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
build_opts=(--pull=true --no-cache --force-rm=true)
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:fraser|${repo}/functest-core:amd64-fraser|g" {} +
for dir in ${amd64_dirs}; do
- (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-latest" .)
- docker push "${repo}/functest-${dir##**/}:amd64-latest"
- [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
+ (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-fraser" .)
+ docker push "${repo}/functest-${dir##**/}:amd64-fraser"
+ [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-fraser" || true)
done
-[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
+[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-fraser" alpine:3.7 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:fraser|${repo}/functest-core:arm64-fraser|g" {} +
for dir in ${arm64_dirs}; do
- (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-latest" .)
- docker push "${repo}/functest-${dir##**/}:arm64-latest"
- [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
+ (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-fraser" .)
+ docker push "${repo}/functest-${dir##**/}:arm64-fraser"
+ [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-fraser" || true)
done
-[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.7 || true)
+[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-fraser" multiarch/alpine:arm64-v3.7 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index a4561f6af..d365b0828 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a66993e2a..202963368 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.7
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
RUN apk --no-cache add --update \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 1a409b051..28870c642 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG FDS_TAG=master
ARG RALLY_TAG=stable/0.10
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 433f8737d..248e94a78 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index bbc0a0760..5a2dce1e0 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 3286c8753..da6083f2f 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
ARG RALLY_TAG=stable/0.10
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index e09ea1c2c..901f2e241 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
ARG RALLY_TAG=stable/0.10
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index e65c0c484..188e33f6c 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:fraser
-ARG BRANCH=master
+ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
ARG VIMS_TAG=stable
ARG JUJU_TAG=tags/juju-2.2.5
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 696a50c51..e56db17d1 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,7 +1,7 @@
-git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
+git+https://gerrit.opnfv.org/gerrit/releng@a2ffc4d1f172b81ec1bdf4ba7e8b00a199b97660#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/sdnvpn@stable/fraser#egg=sdnvpn
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-tests