summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/bifrost-periodic-jobs.yml3
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml9
-rw-r--r--jjb/xci/osa-periodic-jobs.yml3
-rw-r--r--jjb/xci/xci-daily-jobs.yml3
-rw-r--r--jjb/xci/xci-verify-jobs.yml15
5 files changed, 15 insertions, 18 deletions
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index a1892fc5f..67151891f 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -120,9 +120,6 @@
name: SLAVE_LABEL
default: '{slave-label}'
- string:
- name: ANSIBLE_VERBOSITY
- default: ''
- - string:
name: XCI_LOOP
default: 'periodic'
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index af51c2b79..f9106831c 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -21,19 +21,19 @@
#--------------------------------
distro:
- 'xenial':
- disabled: false
+ disabled: true
dib-os-release: 'xenial'
dib-os-element: 'ubuntu-minimal'
dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
extra-dib-elements: 'openssh-server'
- 'centos7':
- disabled: false
+ disabled: true
dib-os-release: '7'
dib-os-element: 'centos-minimal'
dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
extra-dib-elements: 'openssh-server'
- 'suse':
- disabled: false
+ disabled: true
dib-os-release: '42.3'
dib-os-element: 'opensuse-minimal'
dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
@@ -138,9 +138,6 @@
name: BIFROST_LOG_URL
default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
- string:
- name: ANSIBLE_VERBOSITY
- default: '-vvvv'
- - string:
name: XCI_LOOP
default: 'verify'
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 7311baab4..86910ac4f 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -162,9 +162,6 @@
name: FUNCTEST_SUITE_NAME
default: 'healthcheck'
- string:
- name: ANSIBLE_VERBOSITY
- default: '-vvvv'
- - string:
name: FORCE_MASTER
default: 'true'
- string:
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 0835e6709..64659da40 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -209,9 +209,6 @@
name: SLAVE_LABEL
default: '{slave-label}'
- string:
- name: ANSIBLE_VERBOSITY
- default: ''
- - string:
name: XCI_LOOP
default: 'daily'
- string:
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 61dda942a..f0a673bd8 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -182,9 +182,6 @@
name: OPNFV_RELENG_DEV_PATH
default: $WORKSPACE/
- string:
- name: ANSIBLE_VERBOSITY
- default: '-vvvv'
- - string:
name: INSTALLER_TYPE
default: 'osa'
- string:
@@ -215,6 +212,12 @@
- 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
+
# for some reason, the PATH is not set correctly
# setting PATH for ansible stuff
export PATH=/home/jenkins/.local/bin:$PATH
@@ -229,6 +232,12 @@
- shell: |
#!/bin/bash
+ # skip the healthcheck if the patch doesn't impact the deployment
+ if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+ echo "Skipping the healthcheck!"
+ exit 0
+ fi
+
echo "Hello World!"
# this will be enabled once the xci is prepared