summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-merge-jobs.yml
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-19 14:25:29 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-19 14:25:29 +0100
commit448fdae19653c110b3d784861a7d14717e2c198b (patch)
tree8fb2fa7b251c8e429d7d0442e06f866beb16d3b6 /jjb/xci/xci-merge-jobs.yml
parent9dccbc7d59862b2c381fddcf4e6d6710ea2775d0 (diff)
xci: Store the metadata for promoted scenario
Change-Id: I1048be7e7a41c56d25c7689678d3811f0a5eae44 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yml')
-rw-r--r--jjb/xci/xci-merge-jobs.yml21
1 files changed, 13 insertions, 8 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index a7c14ceae..c9788c3d9 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -41,7 +41,7 @@
project-type: multijob
- disabled: '{obj:disabled}'
+ disabled: false
concurrent: false
@@ -167,9 +167,9 @@
project-type: multijob
- disabled: '{obj:disabled}'
+ disabled: false
- concurrent: true
+ concurrent: false
properties:
- logrotate-default
@@ -272,7 +272,7 @@
disabled: false
- concurrent: true
+ concurrent: false
properties:
- logrotate-default
@@ -349,13 +349,19 @@
name: OPNFV_RELENG_DEV_PATH
default: $WORKSPACE/
- string:
+ name: LOCAL_PROMOTION_METADATA_FILE
+ default: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+ - string:
+ name: REMOTE_PROMOTION_METADATA_FILE
+ default: "gs://artifacts.opnfv.org/xci/pipeline/merge/$DEPLOY_SCENARIO.properties"
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
wrappers:
- inject:
- properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+ properties-file: "$LOCAL_PROMOTION_METADATA_FILE"
- ssh-agent-wrapper
- build-timeout:
timeout: 240
@@ -392,6 +398,5 @@
- builder:
name: 'xci-merge-promote-macro'
builders:
- - shell: |
- #!/bin/bash
- echo "Hello World"
+ - shell:
+ !include-raw: ./xci-promote.sh