summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml27
-rw-r--r--jjb/qtip/qtip-experimental-jobs.yml14
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml15
-rw-r--r--jjb/releng/opnfv-docker.sh2
-rw-r--r--jjb/releng/opnfv-docker.yml4
-rwxr-xr-xjjb/xci/xci-set-scenario.sh2
6 files changed, 41 insertions, 23 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9e3a60..357f24e37 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -123,6 +123,9 @@
- 'os-nosdn-bar-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-bar-noha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'k8-nosdn-stor4nfv-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -539,6 +542,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-centos-master-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger'
triggers:
- timed: ''
@@ -632,6 +639,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-huawei-pod7-danube-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
@@ -724,6 +735,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger'
triggers:
- timed: ''
@@ -816,6 +831,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: ''
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
triggers:
- timed: ''
@@ -908,6 +927,10 @@
triggers:
- timed: '0 11 2-30/2 * *'
- trigger:
+ name: 'compass-os-nosdn-bar-noha-virtual-master-trigger'
+ triggers:
+ - timed: '0 22 1-29/2 * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger'
triggers:
- timed: '0 10 2-30/2 * *'
@@ -1000,6 +1023,10 @@
triggers:
- timed: '0 12 2-30/2 * *'
- trigger:
+ name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+ triggers:
+ - timed: '0 12 1-29/2 * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
triggers:
- timed: '' # '0 12 2-30/2 * *'
diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index ee143b4f3..b130912f3 100644
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
name: qtip-experimental-jobs
project: qtip
jobs:
- - 'qtip-{sut}-experimental-{pod}-{stream}'
+ - 'qtip-experimental-{pod}-{stream}'
stream:
- master:
branch: '{stream}'
@@ -19,19 +19,12 @@
installer: fuel
pod: zte-virtual6
- # -------------------------------
- # SYSTEM UNDER TEST
- # -------------------------------
- sut:
- - 'host'
- - 'vnf'
-
################################
## job templates
#################################
- job-template:
- name: 'qtip-{sut}-experimental-{pod}-{stream}'
+ name: 'qtip-experimental-{pod}-{stream}'
disabled: '{obj:disabled}'
@@ -41,9 +34,6 @@
branch: '{branch}'
- '{installer}-defaults'
- '{pod}-defaults'
- - string:
- name: SUT
- default: '{sut}'
scm:
- git-scm-gerrit
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 282cb93e2..5c0bb881b 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -27,34 +27,30 @@
- compute:
installer: apex
pod: zte-virtual5
+ sut: node
<<: *master
- storage:
installer: apex
pod: zte-virtual5
+ sut: ''
<<: *master
- compute:
installer: fuel
pod: zte-virtual6
+ sut: vnf
<<: *master
# -------------------------------
- # SYSTEM UNDER TEST
- # -------------------------------
- sut:
- - 'host'
- - 'vnf'
-
- # -------------------------------
# JOB LIST
# -------------------------------
jobs:
- - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+ - 'qtip-{qpi}-{installer}-{pod}-{stream}'
################################
# job templates
################################
- job-template:
- name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+ name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
disabled: false
parameters:
@@ -85,6 +81,7 @@
default: '{stream}'
- string:
name: SUT
+ description: "System Under Test"
default: '{sut}'
scm:
- git-scm
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 28e5b7ce1..5c8cafbe3 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -111,7 +111,7 @@ fi
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
echo "--------------------------------------------------------"
echo
-cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
+cmd="docker build --pull=true --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
$ARCH_BUILD_ARG
-f $DOCKERFILE $DOCKER_PATH"
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 317efc807..93b9a9c51 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -171,6 +171,10 @@
project: 'yardstick'
<<: *euphrates
<<: *other-receivers
+ - 'xtesting':
+ project: 'functest-xtesting'
+ <<: *master
+ <<: *other-receivers
# projects with jobs for danube
- 'dovetail':
project: 'dovetail'
diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 59205e291..764857ba4 100755
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -58,7 +58,7 @@ fi
git clone https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $WORK_DIRECTORY/$GERRIT_PROJECT
cd $WORK_DIRECTORY/$GERRIT_PROJECT
git fetch https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
-DEPLOY_SCENARIO=$(git diff HEAD^..HEAD --name-only | grep scenarios | sed -r 's/scenarios\/(.*?)\/.*/\1/' | uniq)
+DEPLOY_SCENARIO=$(git diff HEAD^..HEAD --name-only | grep scenarios | awk -F '[/|/]' '{print $2}' | uniq)
# ensure single scenario is impacted
if [[ $(echo $DEPLOY_SCENARIO | wc -w) != 1 ]]; then