summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-09-22 15:20:29 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-09-25 21:26:08 +0200
commit00d093a73191211047f7b5876637967c0b6b1ffe (patch)
treeef1d97f3dc09323da8fb922a409888e76e482802
parentf7d8f8a8b885b2892c7328b7e9a31842b0e925d8 (diff)
jjb: xci: xci-verify-jobs: Use clean vm to verify XCI jobs
Per Idec0fc06c82435adc1a4d569b8e578616998de5f it's now possible to use a clean virtual machine to verify XCI so lets make use of it. Moreover this patch updates the distro parameter to use more accurate names and bring it inline with what dib expects. Change-Id: I18c88637819884fef07d0bfa0dc2c1077a26c2f1 Signed-off-by: Markos Chandras <mchandras@suse.de> Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/xci/xci-verify-jobs.yml49
1 files changed, 33 insertions, 16 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 440fac79f..efc8995c9 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -12,11 +12,11 @@
# distros
#--------------------------------
distro:
- - 'xenial':
+ - 'ubuntu':
disabled: false
- - 'centos7':
+ - 'centos':
disabled: true
- - 'suse':
+ - 'opensuse':
disabled: true
#--------------------------------
# type
@@ -52,11 +52,11 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'xci-verify-.*'
- - 'bifrost-verify-.*'
- - 'bifrost-periodic-.*'
- - 'osa-verify-.*'
- - 'osa-periodic-.*'
+ - 'xci-verify-{distro}-.*'
+ - 'bifrost-verify-{distro}-.*'
+ - 'bifrost-periodic-{distro}-.*'
+ - 'osa-verify-{distro}-.*'
+ - 'osa-periodic-{distro}-.*'
block-level: 'NODE'
wrappers:
@@ -110,7 +110,7 @@
branch: '{branch}'
- label:
name: SLAVE_LABEL
- default: 'xci-virtual-{distro}'
+ default: 'xci-virtual'
- string:
name: CLEAN_DIB_IMAGES
default: 'true'
@@ -174,7 +174,7 @@
parameters:
- string:
name: DISTRO
- default: 'xenial'
+ default: 'ubuntu'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-noha'
@@ -212,7 +212,7 @@
builders:
- description-setter:
- description: "Built on $NODE_NAME"
+ description: "Built on $NODE_NAME for $DISTRO"
- 'xci-verify-{phase}-macro'
#--------------------------------
@@ -230,12 +230,18 @@
exit 0
fi
- # for some reason, the PATH is not set correctly
- # setting PATH for ansible stuff
- export PATH=/home/jenkins/.local/bin:$PATH
+ cd $WORKSPACE
+ ./xci/scripts/vm/start-new-vm.sh $DISTRO
+ - shell: |
+ #!/bin/bash
+
+ # skip the deployment if the patch doesn't impact the deployment
+ if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+ echo "Skipping the deployment!"
+ exit 0
+ fi
- cd $WORKSPACE/xci
- ./xci-deploy.sh
+ ssh ${DISTRO}_xci_vm "cd releng-xci/xci && ./xci-deploy.sh"
- builder:
@@ -251,6 +257,17 @@
fi
echo "Hello World!"
+ - shell: |
+ #!/bin/bash
+
+ # skip the deployment if the patch doesn't impact the deployment
+ if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+ echo "Skipping the deployment!"
+ exit 0
+ fi
+
+ sudo virsh destroy $DISTRO
+ sudo virsh undefine $DISTRO
# this will be enabled once the xci is prepared
#- builder: