summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-verify-jobs.yaml11
-rw-r--r--jjb/apex/apex.yaml21
-rw-r--r--jjb/apex/apex.yaml.j221
-rw-r--r--jjb/opnfvdocs/docs-rtd.yaml2
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yaml6
-rw-r--r--jjb/releng/opnfv-utils.yaml1
-rw-r--r--jjb/storperf/storperf-daily-jobs.yaml6
-rw-r--r--jjb/storperf/storperf-verify-jobs.yaml2
-rw-r--r--jjb/storperf/storperf.yaml2
9 files changed, 48 insertions, 24 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 805fb7246..fb52fa1d9 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -353,6 +353,16 @@
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
+ fi
+ - inject:
+ properties-file: functest_tag
+ override-build-parameters: true
- multijob:
name: functest-smoke
condition: ALWAYS
@@ -361,6 +371,7 @@
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ DOCKER_TAG=$DOCKER_TAG
FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
GERRIT_BRANCH=$GERRIT_BRANCH
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 708b44503..fb0dae121 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -578,14 +578,16 @@
git-revision: false
- shell: |
features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
- if [ "$features" == 'queens' ]; then
- functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
- elif [[ "$features" =~ 'queens' ]]; then
- functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+ if [ "$features" == 'rocky' ]; then
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p')
+ echo "DOCKER_TAG=hunter" > functest_scenario
+ 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
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+ echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
- inject:
properties-file: functest_scenario
override-build-parameters: true
@@ -596,8 +598,9 @@
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ DOCKER_TAG=$DOCKER_TAG
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
@@ -2018,12 +2021,12 @@
- trigger:
name: 'master-master'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'master-rocky'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'master-queens'
@@ -2043,7 +2046,7 @@
- trigger:
name: 'gambia-queens'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'fraser-master'
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 85ebbdf23..4d77f4a39 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -424,14 +424,16 @@
git-revision: false
- shell: |
features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
- if [ "$features" == 'queens' ]; then
- functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
- elif [[ "$features" =~ 'queens' ]]; then
- functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+ if [ "$features" == 'rocky' ]; then
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p')
+ echo "DOCKER_TAG=hunter" > functest_scenario
+ 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
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+ echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
- inject:
properties-file: functest_scenario
override-build-parameters: true
@@ -442,8 +444,9 @@
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ DOCKER_TAG=$DOCKER_TAG
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
@@ -1200,12 +1203,12 @@
- trigger:
name: 'master-master'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'master-rocky'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'master-queens'
@@ -1225,7 +1228,7 @@
- trigger:
name: 'gambia-queens'
triggers:
- - timed: '0 12 * * *'
+ - timed: '0 5 * * *'
- trigger:
name: 'fraser-master'
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index eee1534d5..b4b85f6a0 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -8,6 +8,8 @@
stream:
- master:
branch: 'master'
+ - gambia:
+ branch: 'stable/{stream}'
- fraser:
branch: 'stable/{stream}'
- danube:
diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml
index d308c0981..a97457353 100644
--- a/jjb/opnfvdocs/opnfvdocs.yaml
+++ b/jjb/opnfvdocs/opnfvdocs.yaml
@@ -17,7 +17,11 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - fraser: &fraser
+ - gambia:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 457f7dc2b..05ffd51d9 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -168,6 +168,7 @@
sudo apt-get -y install ansible
fi
+
- builder:
name: run-ansible-build-server-playbook
builders:
diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml
index fe6aebb11..65e1d3232 100644
--- a/jjb/storperf/storperf-daily-jobs.yaml
+++ b/jjb/storperf/storperf-daily-jobs.yaml
@@ -15,8 +15,8 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- fraser: &fraser
- stream: fraser
+ gambia: &gambia
+ stream: gambia
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -69,7 +69,7 @@
- baremetal:
slave-label: apex-baremetal-master
installer: apex
- <<: *fraser
+ <<: *gambia
## armband CI PODs
# - armband-baremetal:
# slave-label: armband-baremetal
diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml
index 4d6b1740a..2acedd7d4 100644
--- a/jjb/storperf/storperf-verify-jobs.yaml
+++ b/jjb/storperf/storperf-verify-jobs.yaml
@@ -13,7 +13,7 @@
gs-pathname: ''
disabled: false
docker-tag: 'latest'
- - fraser: &fraser
+ - gambia: &gambia
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/storperf/storperf.yaml b/jjb/storperf/storperf.yaml
index fe5784777..993094c87 100644
--- a/jjb/storperf/storperf.yaml
+++ b/jjb/storperf/storperf.yaml
@@ -13,7 +13,7 @@
gs-pathname: ''
disabled: false
docker-tag: 'latest'
- - fraser: &fraser
+ - gambia: &gambia
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false