Merge "Replace fedora-24 jobs with fedora-25"

2017-01-19 08:18:21 +00:00 · 2017-01-19 08:18:21 +00:00 · 45d26f75d1
parent 1c8189bd4c 6db5cd3c4f
commit 45d26f75d1
5 changed files with 24 additions and 34 deletions
--- a/jenkins/jobs/ansible-role-jobs.yaml
+++ b/jenkins/jobs/ansible-role-jobs.yaml
@ -112,7 +112,7 @@
      - '{pipeline}-{name}-ansible-{scenario}-{ostype}{suffix}':
          ostype:
            - centos-7
-            - fedora-24
+            - fedora-25
            - ubuntu-trusty
            - ubuntu-xenial
          pipeline: gate
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@ -117,7 +117,6 @@
    suffix: ''
    node:
      - centos-7
-      - fedora-24
      - fedora-25
      - debian-jessie
      - ubuntu-precise
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@ -370,7 +370,7 @@
          suffix: '-nv'
      - 'gate-barbican-{plugin}-devstack{special}-{node}{suffix}':
          plugin: dogtag
-          node: fedora-24
+          node: fedora-25
          services: barbican-dogtag,tempest,keystone
          special: ''
          suffix: '-nv'
@ -3695,9 +3695,9 @@
          suffix: '-nv'
      - '{pipeline}-tempest-dsvm-platform-{name}{suffix}':
          pipeline: gate
-          name: fedora24
+          name: fedora25
          suffix: '-nv'
-          node: fedora-24
+          node: fedora-25
          neutron: 1
      - '{pipeline}-tempest-dsvm-platform-{name}{suffix}':
          pipeline: gate
@ -13752,7 +13752,6 @@
            - ubuntu-precise
            - ubuntu-trusty
            - ubuntu-xenial
-            - fedora-24
            - fedora-25
      - infra-publish-jobs
      - 'gate-{name}-docs-{node}':
--- a/jenkins/jobs/windmill.yaml
+++ b/jenkins/jobs/windmill.yaml
@ -64,7 +64,7 @@
          suffix: '-nv'
          ostype:
            - centos-7
-            - fedora-24
+            - fedora-25
            - ubuntu-trusty
            - ubuntu-xenial
          pipeline: gate
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@ -289,11 +289,11 @@ project-templates:
    gate:
      - 'gate-{name}-dsvm-ansible-func-centos-7'

-  - name: ansible-role-functional-jobs-fedora-24
+  - name: ansible-role-functional-jobs-fedora-25
    check:
-      - 'gate-{name}-ansible-func-fedora-24'
+      - 'gate-{name}-ansible-func-fedora-25'
    gate:
-      - 'gate-{name}-ansible-func-fedora-24'
+      - 'gate-{name}-ansible-func-fedora-25'

  - name: ansible-role-functional-jobs-trusty
    check:
@ -324,7 +324,6 @@ project-templates:
  - name: bindep-fallback
    check:
      - gate-{name}-bindep-fallback-centos-7
-      - gate-{name}-bindep-fallback-fedora-24
      - gate-{name}-bindep-fallback-fedora-25
      - gate-{name}-bindep-fallback-debian-jessie
      - gate-{name}-bindep-fallback-ubuntu-precise
@ -332,7 +331,6 @@ project-templates:
      - gate-{name}-bindep-fallback-ubuntu-xenial
    gate:
      - gate-{name}-bindep-fallback-centos-7
-      - gate-{name}-bindep-fallback-fedora-24
      - gate-{name}-bindep-fallback-fedora-25
      - gate-{name}-bindep-fallback-debian-jessie
      - gate-{name}-bindep-fallback-ubuntu-precise
@ -1029,7 +1027,6 @@ project-templates:
      - gate-infra-puppet-apply-3-ubuntu-precise
      - gate-infra-puppet-apply-3-ubuntu-trusty
      - gate-infra-puppet-apply-3-ubuntu-xenial
-      - gate-infra-puppet-apply-3-fedora-24
      - gate-infra-puppet-apply-3-fedora-25
      - gate-openstackci-beaker-centos-7
      - gate-openstackci-beaker-ubuntu-trusty
@ -1040,7 +1037,6 @@ project-templates:
      - gate-infra-puppet-apply-3-ubuntu-precise
      - gate-infra-puppet-apply-3-ubuntu-trusty
      - gate-infra-puppet-apply-3-ubuntu-xenial
-      - gate-infra-puppet-apply-3-fedora-24
      - gate-infra-puppet-apply-3-fedora-25
      - gate-openstackci-beaker-centos-7
      - gate-openstackci-beaker-ubuntu-trusty
@ -1183,9 +1179,9 @@ project-templates:
    check:
      - 'gate-windmill-deploy-centos-7-nv'

-  - name: windmill-jobs-fedora-24-nv
+  - name: windmill-jobs-fedora-25-nv
    check:
-      - 'gate-windmill-deploy-fedora-24-nv'
+      - 'gate-windmill-deploy-fedora-25-nv'

  - name: windmill-jobs-trusty
    check:
@ -1236,10 +1232,6 @@ jobs:
  - name: ^gate-infra-puppet-apply-.*-ubuntu-trusty$
    branch: master

-  # Transitional as we remove Fedora 23
-  - name: ^gate-infra-puppet-apply-.*-fedora-24$
-    voting: false
-
  # TODO(jaegerandi): Make voting once it passes everywhere
  - name: gate-openstackci-beaker-ubuntu-xenial
    voting: false
@ -3496,7 +3488,7 @@ projects:
      - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
      - gate-tempest-dsvm-platform-ubuntu-trusty
      - gate-tempest-dsvm-platform-centos7-nv
-      - gate-tempest-dsvm-platform-fedora24-nv
+      - gate-tempest-dsvm-platform-fedora25-nv
      - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty
      - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial
    gate:
@ -3742,7 +3734,7 @@ projects:
      - gate-tempest-dsvm-full-ubuntu-xenial-newton-nv
      - gate-tempest-dsvm-neutron-full-ubuntu-xenial-newton-nv
      - gate-tempest-dsvm-platform-centos7-nv
-      - gate-tempest-dsvm-platform-fedora24-nv
+      - gate-tempest-dsvm-platform-fedora25-nv
      - gate-tempest-dsvm-multinode-full-ubuntu-trusty-nv
      - gate-tempest-dsvm-neutron-multinode-full-ubuntu-trusty-nv
      - gate-tempest-dsvm-multinode-full-ubuntu-xenial-nv
@ -5143,7 +5135,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5163,7 +5155,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5185,7 +5177,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5219,7 +5211,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5232,7 +5224,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5245,7 +5237,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5258,7 +5250,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5271,7 +5263,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5284,7 +5276,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7-nv
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5297,7 +5289,7 @@ projects:
      - name: merge-check
      - name: ansible-role-jobs
      - name: ansible-role-functional-jobs-centos7
-      - name: ansible-role-functional-jobs-fedora-24
+      - name: ansible-role-functional-jobs-fedora-25
      - name: ansible-role-functional-jobs-trusty
      - name: ansible-role-functional-jobs-xenial
      - name: docs-on-rtfd
@ -5585,7 +5577,7 @@ projects:
      - barbican-coverage-ubuntu-xenial
      - gate-barbican-simple-crypto-devstack-ubuntu-trusty
      - gate-barbican-simple-crypto-devstack-ubuntu-xenial
-      - gate-barbican-dogtag-devstack-fedora-24-nv
+      - gate-barbican-dogtag-devstack-fedora-25-nv
      - gate-barbican-simple-crypto-devstack-postgres-ubuntu-trusty-nv
      - gate-barbican-simple-crypto-devstack-postgres-ubuntu-xenial-nv
    gate:
@ -17999,7 +17991,7 @@ projects:
      - name: docs-on-rtfd
      - name: windmill-buildimages-trusty
      - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-fedora-24-nv
+      - name: windmill-jobs-fedora-25-nv
      - name: windmill-jobs-trusty
      - name: windmill-jobs-xenial
    periodic: