Merge "Bugfix: HA failed on Compass master because of lacking pod.yaml"

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e28f744..c29a10d 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -50,7 +50,7 @@
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-unit-test-{stream}'
-      - 'doctor-{task}-{installer}-{inspector}-{stream}'
+      - 'doctor-{task}-{inspector}-{stream}'
       - 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
 
 - job-template:
@@ -135,14 +135,12 @@
 
 
 - job-template:
-    name: 'doctor-{task}-{installer}-{inspector}-{stream}'
+    name: 'doctor-{task}-{inspector}-{stream}'
 
     disabled: '{obj:disabled}'
 
     project-type: 'multijob'
 
-    node: '{slave-label}'
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -151,8 +149,7 @@
           name: OS_CREDS
           default: /home/jenkins/openstack.creds
           description: 'OpenStack credentials'
-      - '{slave-label}-defaults'
-      - '{installer}-defaults'
+      - 'opnfv-build-ubuntu-defaults'
       - string:
           name: DOCKER_TAG
           default: '{docker-tag}'
@@ -214,16 +211,30 @@
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-installer-inspector'
+          name: 'doctor-verify-apex-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-apex-{inspector}-build-x86_64-{stream}'
+              current-parameters: false
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-{installer}-{inspector}-build-x86_64-{stream}'
+            - name: 'doctor-{task}-fuel-{inspector}-build-x86_64-{stream}'
               current-parameters: false
               git-revision: true
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'doctor-{task}-{installer}-{inspector}-build-aarch64-{stream}'
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-fuel-{inspector}-build-aarch64-{stream}'
               current-parameters: false
               git-revision: true
               node-parameters: false
@@ -233,6 +244,7 @@
 - job-template:
     name: 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave-label}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -241,6 +253,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - '{installer}-defaults'
       - '{slave-label}-defaults'
     scm:
       - git-scm-gerrit

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 569bff2..92f7a34 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -18,6 +18,11 @@
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+    master: &master
+      stream: master
+      branch: '{stream}'
+      disabled: false
+      gs-pathname: ''
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -27,7 +32,9 @@
       - baremetal:
           slave-label: joid-baremetal
           <<: *euphrates
-
+      - baremetal:
+          slave-label: joid-baremetal
+          <<: *master
     # -------------------------------
     # scenarios
     # -------------------------------
@@ -56,6 +63,14 @@
           auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-openbaton-ha':
           auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-canal-lb-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-nosdn-lb_ceph-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-multus-lb-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-ovn-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
       - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -222,53 +237,148 @@
     name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 2 * * *'
+# os-nosdn-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 2 * * *'
 # os-odl_l2-nofeature-ha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 7 * * *'
+# os-odl_l2-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 7 * * *'
 # os-nosdn-lxd-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 22 * * *'
+# os-nosdn-lxd-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 22 * * *'
 # os-nosdn-lxd-ha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 10 * * *'
+# os-nosdn-lxd-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 10 * * *'
 # os-nosdn-nofeature-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 4 * * *'
+# os-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 4 * * *'
 # k8-nosdn-nofeature-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 15 * * *'
+# k8-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 15 * * *'
 # k8-nosdn-lb-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 20 * * *'
+# k8-nosdn-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 20 * * *'
 # k8-ovn-lb-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 17 * * *'
+# k8-ovn-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 17 * * *'
 # os-nosdn-openbaton-ha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 25 * * *'
+# os-nosdn-openbaton-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 25 * * *'
 # os-ocl-nofeature-ha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 13 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+# os-ocl-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 13 * * *'
+# os-ocl-nofeature-noha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '5 17 * * *'
+      - timed: '5 16 * * *'
+# os-ocl-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 16 * * *'
+# k8-canal-lb-noha trigger - branch: euphrates
+- trigger:
+    name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: '5 14 * * *'
+# k8-canal-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 14 * * *'
+# k8-multus-lb-noha trigger - branch: euphrates
+- trigger:
+    name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-multus-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: euphrates
+- trigger:
+    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 18 * * *'
+# os-ovn-nofeature-ha trigger - branch: euphrates
+- trigger:
+    name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: '5 19 * * *'
+# os-ovn-nofeature-ha trigger - branch: master
+- trigger:
+    name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '5 19 * * *'

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 1db4fac..d9d3e72 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -89,7 +89,7 @@
 
     wrappers:
       - timeout:
-          timeout: 15
+          timeout: 30
           abort: true
       - timestamps