summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/armband/armband-ci-jobs.yaml4
-rw-r--r--jjb/fuel/fuel-daily-jobs.yaml4
-rw-r--r--jjb/fuel/fuel-verify-jobs.yaml3
3 files changed, 11 insertions, 0 deletions
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 2ab1a6d53..df01ddadb 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -12,16 +12,19 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ functest_docker_tag: hunter
fraser: &fraser
stream: fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
+ functest_docker_tag: '{stream}'
gambia: &gambia
stream: gambia
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
+ functest_docker_tag: '{stream}'
# -------------------------------
# DEPLOY TYPE ANCHORS
# -------------------------------
@@ -161,6 +164,7 @@
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
+ DOCKER_TAG={functest_docker_tag}
same-node: true
block: true
block-thresholds:
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index fb619c3f5..57ed85fcc 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,16 +16,19 @@
branch: '{stream}'
disabled: false
gs-pathname: ''
+ functest_docker_tag: hunter
fraser: &fraser
stream: fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
+ functest_docker_tag: '{stream}'
gambia: &gambia
stream: gambia
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
+ functest_docker_tag: '{stream}'
# -------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
# -------------------------------
@@ -179,6 +182,7 @@
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
+ DOCKER_TAG={functest_docker_tag}
same-node: true
block: true
block-thresholds:
diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 5695ef8a0..9b8b187eb 100644
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -13,10 +13,12 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ functest_docker_tag: hunter
- gambia:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
+ functest_docker_tag: '{stream}'
#####################################
# cluster architectures
#####################################
@@ -146,6 +148,7 @@
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ DOCKER_TAG={functest_docker_tag}
node-parameters: true
enable-condition: "def m = ! ('$NODE_LABELS' =~ /armband-virtual/)"
kill-phase-on: NEVER