Merge "Add functest-kubernetes project job"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9e3a..357f24e 100644 (file)
--- 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'
@@ -538,6 +541,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
     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:
@@ -631,6 +638,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
     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:
@@ -723,6 +734,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
     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:
@@ -815,6 +830,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
     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:
@@ -907,6 +926,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
     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:
@@ -999,6 +1022,10 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
     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:

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index ee143b4..b130912 100644 (file)
--- 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 282cb93..5c0bb88 100644 (file)
--- 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 28e5b7c..5c8cafb 100644 (file)
--- 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 317efc8..93b9a9c 100644 (file)
--- 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 59205e2..764857b 100755 (executable)
--- 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