ceph*setup: Unpin to trusty slaves

Not sure why this was needed in the first place but not only do we not have any actual 'trusty' slaves anymore.  Any Ubuntu slave should do.  I tried CentOS but `dch` is required and conflicts with RPM packaging tools.

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

diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
index 5b0643cd662c90bee6828f09c71e02c81dfc7a36..56337af67d5fd28b1a7ce066345d75670ced73d7 100644 (file)
--- a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
+++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
@@ -1,9 +1,7 @@
 - job:
     name: ceph-dev-new-setup
     description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-dev-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
-    # we do not need to pin this to trusty anymore for the new jenkins instance
-    # FIXME: unpin when this gets ported over
-    node: huge && trusty && x86_64
+    node: huge && bionic && x86_64
     display-name: 'ceph-dev-new-setup'
     block-downstream: false
     block-upstream: false

diff --git a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
index e25329acfd8ae7da6b65fb7d4b2dcf75e2ab997a..ab67e1160feffa84624ca4c15d86032d224b4860 100644 (file)
--- a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
+++ b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
@@ -1,9 +1,7 @@
 - job:
     name: ceph-dev-setup
     description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-dev-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
-    # we do not need to pin this to trusty anymore for the new jenkins instance
-    # FIXME: unpin when this gets ported over
-    node: huge && trusty && x86_64
+    node: huge && bionic && x86_64
     display-name: 'ceph-dev-setup'
     block-downstream: false
     block-upstream: false

diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml
index b728a627935b912756a5125765e8157b15176c13..aaa321f1f21311e29c374b438d0733f0c99a0e05 100644 (file)
--- a/ceph-setup/config/definitions/ceph-setup.yml
+++ b/ceph-setup/config/definitions/ceph-setup.yml
@@ -1,9 +1,7 @@
 - job:
     name: ceph-setup
     description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
-    # we do not need to pin this to trusty anymore for the new jenkins instance
-    # FIXME: unpin when this gets ported over
-    node: huge && trusty && x86_64
+    node: huge && bionic && x86_64
     display-name: 'ceph-setup'
     block-downstream: false
     block-upstream: false