multiple PR jobs: Run on any Ubuntu node

All of Jenkins builders are running Ubuntu Focal.  They all have the bionic label.  They also have the xenial label but that's only because we're still building packages *for* Xenial.  But not *on* Xenial.

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index d93509a4a3a82d45deba39fb0c9fbf8479a943e2..0b51070659d6913b4dfb72da74151ba90f4d5c12 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -22,7 +22,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && bionic && x86_64 && !xenial && !trusty
+    node: huge && bionic && x86_64
     quiet-period: 5
     block-downstream: false
     block-upstream: false

diff --git a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
index e95cd6a082c7e5c80ce69b175cb3dbfa317ee022..fca39b62f0d5c2e747441aea1fb2c4a2eded0d22 100644 (file)
--- a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
+++ b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && bionic && x86_64 && !xenial && !trusty
+    node: huge && bionic && x86_64
     display-name: 'ceph: dashboard Pull Requests'
     quiet-period: 5
     block-downstream: false

diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index 30eb3dddfc759ea801c18e81200ae6165e6e69ac..055a2c4d18b713f318d3bef96416f26a21220fc7 100644 (file)
--- a/ceph-pr-api/config/definitions/ceph-pr-api.yml
+++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && bionic && x86_64 && !xenial && !trusty
+    node: huge && bionic && x86_64
     display-name: 'ceph: API'
     quiet-period: 5
     block-downstream: false

diff --git a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
index 430dc46505f2444c63f88030eda54ef6b70dff18..d2f2440810bd6d86cc8cba019624936465c8f250 100644 (file)
--- a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
+++ b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
@@ -2,7 +2,7 @@
     name: ceph-pr-docs
     display-name: 'ceph: Pull Requests Docs Check'
     concurrent: true
-    node: bionic && x86_64 && !xenial && !trusty
+    node: bionic && x86_64
     project-type: freestyle
     defaults: global
     quiet-period: 5

diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
index 9558f37124885b430c922391e596894ed698b832..a72638bdb5f0876b48612bed122c524f900e9a73 100644 (file)
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -4,7 +4,7 @@
     defaults: global
     concurrent: true
     # We want make check to only run on Bionic b/c it has python2 and python3 and b/c all builds should build on Bionic
-    node: huge && bionic && x86_64 && !xenial && !trusty
+    node: huge && bionic && x86_64
     display-name: 'ceph: Pull Requests'
     quiet-period: 5
     block-downstream: false

diff --git a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
index 6d89563abdc3d14fac10f69a55880105691249d3..47a20fd94f5366c780b3da0fbf1afc935cbf77d7 100644 (file)
--- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
+++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
@@ -1,6 +1,6 @@
 - job:
     name: teuthology-pull-requests
-    node: sepia && bionic && huge && !xenial && !arm64
+    node: sepia && bionic && huge
     project-type: freestyle
     defaults: global
     concurrent: true