From: David Galloway Date: Thu, 30 Apr 2020 16:20:51 +0000 (-0400) Subject: ceph*setup: Unpin to trusty slaves X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cc92887b30d5b484bc1238d4acfbef475bb1bb2;p=ceph-build.git 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 --- 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 5b0643cd..56337af6 100644 --- 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 e25329ac..ab67e116 100644 --- 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 b728a627..aaa321f1 100644 --- 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