summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex-functest-scenario.sh2
-rw-r--r--jjb/apex/apex-verify-jobs.yaml13
-rw-r--r--jjb/auto/auto.yaml3
-rwxr-xr-xjjb/fuel/fuel-deploy.sh3
-rwxr-xr-xjjb/functest/functest-alpine.sh2
-rw-r--r--jjb/releng/opnfv-docker.yaml2
-rw-r--r--releases/gambia/apex.yaml8
-rw-r--r--releases/gambia/armband.yaml3
-rw-r--r--releases/gambia/bottlenecks.yaml5
-rw-r--r--releases/gambia/compass4nfv.yaml14
-rw-r--r--releases/gambia/doctor.yaml4
-rw-r--r--releases/gambia/fuel.yaml3
-rw-r--r--releases/gambia/ipv6.yaml10
-rw-r--r--releases/gambia/samplevnf.yaml6
-rw-r--r--releases/gambia/vswitchperf.yaml5
-rwxr-xr-xutils/fetch_os_creds.sh2
16 files changed, 67 insertions, 18 deletions
diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh
index dcbed4479..f1cb74e24 100644
--- a/jjb/apex/apex-functest-scenario.sh
+++ b/jjb/apex/apex-functest-scenario.sh
@@ -11,7 +11,7 @@ elif [[ "$features" =~ 'rocky' ]]; then
functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p')
echo "DOCKER_TAG=hunter" > functest_scenario
else
- functest_scenario=$DEPLOY_SCENARIO
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/-(noha|ha).*/-\1/p')
echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
echo "latest" || echo ${BRANCH##*/})" > functest_scenario
fi
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index c10a7836e..23ce14f80 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -355,17 +355,10 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - shell: |
- features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
- if [ "$features" == 'rocky' ]; then
- echo "DOCKER_TAG=hunter" > functest_tag
- elif [[ "$features" =~ 'rocky' ]]; then
- echo "DOCKER_TAG=hunter" > functest_tag
- else
- echo "DOCKER_TAG=''" > functest_tag
- fi
+ - shell:
+ !include-raw-escape: ./apex-functest-scenario.sh
- inject:
- properties-file: functest_tag
+ properties-file: functest_scenario
override-build-parameters: true
- multijob:
name: functest-smoke
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index ccf723f01..84bb6141c 100644
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -120,6 +120,9 @@
branch: '{branch}'
- 'intel-pod18-defaults'
+ scm:
+ - git-scm
+
triggers:
- timed: '0 16 * * *'
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 8bc5fa268..418b814e5 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -19,9 +19,6 @@ LAB_NAME=${NODE_NAME/-*}
# shellcheck disable=SC2153
POD_NAME=${NODE_NAME/*-}
-# define Docker tag for stable branches
-[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/}
-
# Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs
if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 42bf60b0a..91ca5eb88 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -98,7 +98,7 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert"
echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh
-elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
+elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then
cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
fi
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 17235b37d..1f7366688 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -302,7 +302,7 @@
<<: *other-receivers
- 'bottlenecks':
project: 'bottlenecks'
- <<: *euphrates
+ <<: *gambia
<<: *other-receivers
- 'nfvbench':
project: 'nfvbench'
diff --git a/releases/gambia/apex.yaml b/releases/gambia/apex.yaml
index fada4cbb1..d9bed66db 100644
--- a/releases/gambia/apex.yaml
+++ b/releases/gambia/apex.yaml
@@ -12,6 +12,14 @@ project-type: installer
release-model: stable
upstream: https://wiki.openstack.org/wiki/TripleO
+releases:
+ - version: opnfv-7.0.0
+ location:
+ apex: de387870dfc45fa9a9b066bbfe1c96c731cb086b
+ - version: opnfv-7.1.0
+ location:
+ apex: 06da44b76d254987d41b083960b2f3637175a791
+
branches:
- name: stable/gambia
location:
diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml
index 2e5f65af5..a523d5a40 100644
--- a/releases/gambia/armband.yaml
+++ b/releases/gambia/armband.yaml
@@ -15,6 +15,9 @@ releases:
- version: opnfv-7.0.0
location:
armband: 30027365166c204bc03043234bbc6b0dfc2506fb
+ - version: opnfv-7.1.0
+ location:
+ armband: 5d8dd94fd0a50d9899010eb764e94abcb05b38c7
branches:
- name: stable/gambia
diff --git a/releases/gambia/bottlenecks.yaml b/releases/gambia/bottlenecks.yaml
index d32d2073f..564bf7d35 100644
--- a/releases/gambia/bottlenecks.yaml
+++ b/releases/gambia/bottlenecks.yaml
@@ -7,3 +7,8 @@ branches:
- name: stable/gambia
location:
bottlenecks: 399ec2f328f56c1f81c454ecedfb6b99eaf93c42
+
+releases:
+ - version: opnfv-7.1.0
+ location:
+ bottlenecks: b38c653c910ed4cf83d6e8d0df1b88b1bb109f4b
diff --git a/releases/gambia/compass4nfv.yaml b/releases/gambia/compass4nfv.yaml
index e0523889c..baf1fdea4 100644
--- a/releases/gambia/compass4nfv.yaml
+++ b/releases/gambia/compass4nfv.yaml
@@ -10,3 +10,17 @@ branches:
- name: stable/gambia
location:
compass-containers: 20e229822b31b03e1120c3e5efd4ba131261617e
+
+releases:
+ - version: opnfv-7.0.0
+ location:
+ compass4nfv: 33f94b43639dbe37b7e8e2b5eeb4c65064207c6b
+ - version: opnfv-7.0.0
+ location:
+ compass-containers: 20e229822b31b03e1120c3e5efd4ba131261617e
+ - version: opnfv-7.1.0
+ location:
+ compass4nfv: 5838841f09950160f907e15fc14282449f6652af
+ - version: opnfv-7.1.0
+ location:
+ compass-containers: c8fd057f2752713a21d093f5255348e2b183871e
diff --git a/releases/gambia/doctor.yaml b/releases/gambia/doctor.yaml
index 3bf86a494..73707a63a 100644
--- a/releases/gambia/doctor.yaml
+++ b/releases/gambia/doctor.yaml
@@ -18,7 +18,9 @@ releases:
- version: opnfv-7.0.1
location:
doctor: 9250be9b9f3e3fff0c5aa827daf89f0212ce964f
-
+ - version: opnfv-7.1.0
+ location:
+ doctor: e4ad3e7cf33e7696a08a52c4e167e240f56c7428
branches:
- name: stable/gambia
location:
diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml
index a958209b0..3a60effb8 100644
--- a/releases/gambia/fuel.yaml
+++ b/releases/gambia/fuel.yaml
@@ -20,5 +20,8 @@ releases:
- version: opnfv-7.0.0
location:
fuel: 326c26b9b89c23e9775ba287d9da3bea35cfc437
+ - version: opnfv-7.1.0
+ location:
+ fuel: 79c56150533ec77e73bede445e74960affbbef67
release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html
diff --git a/releases/gambia/ipv6.yaml b/releases/gambia/ipv6.yaml
index a566e547c..2f2ccecbd 100644
--- a/releases/gambia/ipv6.yaml
+++ b/releases/gambia/ipv6.yaml
@@ -11,7 +11,17 @@ project: ipv6
project-type: feature
release-model: stable
+releases:
+ - version: opnfv-7.0.0
+ location:
+ ipv6: c0e6ae3d1d443f96f0ab50e417f9ad740669b890
+ - version: opnfv-7.1.0
+ location:
+ ipv6: 7978c6172432174ea6027922524b476783516f56
+
branches:
- name: stable/gambia
location:
ipv6: e36f753cf6e9ab0c02a400b6bac5c79b48268d44
+
+release-notes: https://opnfv-ipv6.readthedocs.io/en/stable-gambia/release/release-notes/
diff --git a/releases/gambia/samplevnf.yaml b/releases/gambia/samplevnf.yaml
index 6efd2d49b..0d9500e7f 100644
--- a/releases/gambia/samplevnf.yaml
+++ b/releases/gambia/samplevnf.yaml
@@ -7,6 +7,12 @@ releases:
- version: opnfv-7.0.0
location:
samplevnf: 66ee98f3427439a4cdd56c9f67a25aec140a5c9c
+ - version: opnfv-7.0.1
+ location:
+ samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015
+ - version: opnfv-7.1.0
+ location:
+ samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015
branches:
- name: stable/gambia
diff --git a/releases/gambia/vswitchperf.yaml b/releases/gambia/vswitchperf.yaml
index 8daa55e73..dd13b790f 100644
--- a/releases/gambia/vswitchperf.yaml
+++ b/releases/gambia/vswitchperf.yaml
@@ -7,3 +7,8 @@ branches:
- name: stable/gambia
location:
vswitchperf: 96de8654952a606d28d56c057ba871b5553e4176
+
+releases:
+ - version: opnfv-7.0.0
+ location:
+ vswitchperf: ad9507ef023f36494024d805cd2d4640536bd7a4
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 501095036..4a66187e5 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -113,7 +113,7 @@ if [ "$installer_type" == "fuel" ]; then
ssh ${ssh_options} "${ssh_user}@${controller_ip}" \
"sudo cat /root/keystonercv3" > "${dest_path}"
- if [[ ! "${BUILD_TAG}" =~ 'virtual' ]]; then
+ if [[ ! "${DEPLOY_SCENARIO}" =~ -noha$ ]]; then
ssh ${ssh_options} "${ssh_user}@${installer_ip}" \
"cat /etc/ssl/certs/os_cacert" > "${os_cacert}"
fi