summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-16 16:26:15 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-16 16:26:15 +0100
commit1cfa467118efaf88d74aaa8b22b2daf247caa7c2 (patch)
tree2efc7b9eaaac6ff0538449298529e8a54004e0af
parentbcd0ecb50359270320bfd41ecd443a2a6528af3f (diff)
[fuel] Propagate INSTALLER_VERSION
Change-Id: I590c904acd8b71e6c3cea93b85cc9d23f79c3225 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--jjb/armband/armband-ci-jobs.yaml16
-rw-r--r--jjb/fuel/fuel-daily-jobs.yaml16
2 files changed, 22 insertions, 10 deletions
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 2fda33e4c..568cb9b9d 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -148,8 +148,9 @@
- trigger-builds:
- project: '{installer}-deploy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
same-node: true
block: true
- conditional-step:
@@ -164,6 +165,7 @@
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
DOCKER_TAG={functest_docker_tag}
same-node: true
block: true
@@ -181,8 +183,9 @@
- trigger-builds:
- project: 'yardstick-{installer}-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -209,8 +212,9 @@
- trigger-builds:
- project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -230,8 +234,9 @@
- trigger-builds:
- project: 'dovetail-{installer}-{pod}-default-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -242,8 +247,9 @@
- trigger-builds:
- project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 6cc6ab1c9..f90c5ef3a 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -166,8 +166,9 @@
- trigger-builds:
- project: 'fuel-deploy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
same-node: true
block: true
- conditional-step:
@@ -182,6 +183,7 @@
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
DOCKER_TAG={functest_docker_tag}
same-node: true
block: true
@@ -199,8 +201,9 @@
- trigger-builds:
- project: 'yardstick-fuel-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -222,8 +225,9 @@
- trigger-builds:
- project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -246,8 +250,9 @@
- trigger-builds:
- project: 'dovetail-fuel-{pod}-default-optional-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds:
@@ -257,8 +262,9 @@
- trigger-builds:
- project: 'fuel-collect-logs-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
block: true
same-node: true
block-thresholds: