Merge "Remove devstack-gate-periodic-jobs.yaml"

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml

@@ -1,102 +0,0 @@
-- job-template:
-    name: 'periodic-tempest-dsvm-all{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 185
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=180
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL=1
-          export ZUUL_BRANCH={branch-override}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job-template:
-    name: 'periodic-tempest-dsvm-coverage{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 185
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=180
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_COVERAGE=1
-          export ZUUL_BRANCH={branch-override}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job-template:
-    name: 'periodic-tempest-dsvm-stress{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 185
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=180
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_STRESS=1
-          export ZUUL_BRANCH={branch-override}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job-group:
-    name: devstack-periodic-jobs
-    jobs:
-      - '{pipeline}-tempest-dsvm-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
-      - 'periodic-tempest-dsvm-all{branch-designator}'
-      - 'periodic-tempest-dsvm-coverage{branch-designator}'
-      - 'periodic-tempest-dsvm-stress{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}'
-      - '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
-      - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -877,6 +877,96 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-all{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 185
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=180
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL=1
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-coverage{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 185
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=180
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_COVERAGE=1
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-stress{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 185
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=180
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_STRESS=1
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-group:
     name: devstack-gate-jobs
     jobs:
@@ -913,3 +1003,6 @@
       - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
+      - '{pipeline}-tempest-dsvm-all{branch-designator}'
+      - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
+      - '{pipeline}-tempest-dsvm-stress{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1084,21 +1084,21 @@
           branch-designator: '-havana'
           branch-override: stable/havana
       # Periodic jobs for various branches
-      - devstack-periodic-jobs:
+      - devstack-jobs:
           pipeline: periodic
+          node: devstack-precise
           branch-designator: '-grizzly'
           branch-override: stable/grizzly
-          node: devstack-precise
+      - devstack-jobs:
-      - devstack-periodic-jobs:
           pipeline: periodic
+          node: devstack-precise
           branch-designator: '-havana'
           branch-override: stable/havana
-          node: devstack-precise
+      - devstack-jobs:
-      - devstack-periodic-jobs:
           pipeline: periodic
+          node: devstack-precise
           branch-designator: '-master'
           branch-override: master
-          node: devstack-precise
       # Special jobs for devstack-gate
       - devstack-gate-jobs:
           node: devstack-precise