diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-04-06 05:20:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-06 05:20:27 +0000 |
| commit | 5f0c83e1fedbd02252049c6753669da5c7670dde (patch) | |
| tree | ba9b5f92016bb22abfd611bbd5a1d4be6b95c072 /jjb/xci | |
| parent | 65b1aa43850a1154a9153a2bf7b3271f46ca0d5d (diff) | |
| parent | d1378b9f3d570d07af5a8f08144070059105373f (diff) | |
Merge "xci: Introduce XCI_LOOP variable to control what to do properly"
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/bifrost-periodic-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/xci/osa-periodic-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/xci/xci-deploy.sh | 6 |
5 files changed, 20 insertions, 3 deletions
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml index 0c29fd3c9..3e9ff678e 100644 --- a/jjb/xci/bifrost-periodic-jobs.yml +++ b/jjb/xci/bifrost-periodic-jobs.yml @@ -122,6 +122,9 @@ - string: name: ANSIBLE_VERBOSITY default: '' + - string: + name: XCI_LOOP + default: 'periodic' wrappers: - fix-workspace-permissions diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index 80c816ca1..806829620 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -140,6 +140,9 @@ - string: name: ANSIBLE_VERBOSITY default: '-vvvv' + - string: + name: XCI_LOOP + default: 'verify' scm: - git: diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml index 42b49411b..56a4b18b4 100644 --- a/jjb/xci/osa-periodic-jobs.yml +++ b/jjb/xci/osa-periodic-jobs.yml @@ -119,6 +119,9 @@ - string: name: ANSIBLE_VERBOSITY default: '' + - string: + name: XCI_LOOP + default: 'periodic' wrappers: - fix-workspace-permissions diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index 94bfafed0..64e13d3eb 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -109,6 +109,9 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + - string: + name: XCI_LOOP + default: 'daily' triggers: - '{auto-trigger-name}' @@ -125,6 +128,7 @@ predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO XCI_FLAVOR=$XCI_FLAVOR + XCI_LOOP=$XCI_LOOP same-node: true block: true - trigger-builds: @@ -133,6 +137,7 @@ predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO XCI_FLAVOR=$XCI_FLAVOR + XCI_LOOP=$XCI_LOOP same-node: true block: true block-thresholds: @@ -205,6 +210,9 @@ - string: name: ANSIBLE_VERBOSITY default: '' + - string: + name: XCI_LOOP + default: 'daily' builders: - description-setter: diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh index 07ca795da..b007b852f 100755 --- a/jjb/xci/xci-deploy.sh +++ b/jjb/xci/xci-deploy.sh @@ -15,14 +15,14 @@ cd $WORKSPACE/prototypes/xci # for daily jobs, we want to use working versions # for periodic jobs, we will use whatever is set in the job, probably master -if [[ "$JOB_NAME" =~ "daily" ]]; then +if [[ "$XCI_LOOP" == "daily" ]]; then # source pinned-vars to get releng version source ./config/pinned-versions # checkout the version git checkout -q $OPNFV_RELENG_VERSION echo "Info: Using $OPNFV_RELENG_VERSION" -elif [[ "$JOB_NAME" =~ "periodic" ]]; then +elif [[ "$XCI_LOOP" == "periodic" ]]; then echo "Info: Using $OPNFV_RELENG_VERSION" fi @@ -31,7 +31,7 @@ fi # to take this into account while deploying anyways # clone openstack-ansible # stable/ocata already use pinned versions so this is only valid for master -if [[ "$JOB_NAME" =~ "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then +if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then cd $WORKSPACE # get the url to openstack-ansible git source ./config/env-vars |