use the 'trusty' label

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
index a2f479baee5672de1b0a75a9a36bd8e912dc627d..9bca339fabf8ade1f4eb0f0642eb07a43d0811cf 100644 (file)
--- a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
+++ b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-build-pull-requests
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false

diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
index e095065db38bfeee25a97ecd4d451a5ef038806d..b5899183d65bec574e0ce35f13ebaaa20b2e9ddf 100644 (file)
--- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
+++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
@@ -1,6 +1,6 @@
 - job:
-    name: ceph-deploy-docs 
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    name: ceph-deploy-docs
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false
@@ -14,8 +14,8 @@
       - github:
           url: https://github.com/ceph/ceph-deploy
     logrotate:
-      daysToKeep: -1 
-      numToKeep: -1 
+      daysToKeep: -1
+      numToKeep: -1
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
 
@@ -26,7 +26,7 @@
       - git:
           url: https://github.com/ceph/ceph-deploy.git
           branches:
-            - master 
+            - master
           browser: githubweb
           browser-url: https://github.com/ceph/ceph-deploy.git
           timeout: 20

diff --git a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
index bd85f1b60475f271006c2860d1695524b4742974..55aa585b37f618d0ac7fc3359ff92a3753c3608b 100644 (file)
--- a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
+++ b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-deploy-pull-requests
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false

diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index 880d8fc2dad495368463e9617957f25b5baeda6b..4396fc22760efa7561319565d28ec8c9b26a21e9 100644 (file)
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-deploy
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     project-type: matrix
     defaults: global
     disabled: false

diff --git a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
index 4520721ecd61d11a67d7b8b08844851ee9e3af54..f340432d581b93fed32f3942f464d35242c4aa26 100644 (file)
--- a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
+++ b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-qa-suite-pull-requests
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false

diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml
index bbb3ce5518330ccfb867afe1917a6ceda8d1920d..31d70c1efae371346826df0ef749ecae18b30025 100644 (file)
--- a/ceph-setup/config/definitions/ceph-setup.yml
+++ b/ceph-setup/config/definitions/ceph-setup.yml
@@ -1,7 +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."
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     disabled: false
     display-name: 'ceph-setup'
     concurrent: false

diff --git a/jjb/config/definitions/jjb.yml b/jjb/config/definitions/jjb.yml
index 1ef1ae19c1f2915f1e522d492b7478cf91cb8166..bdb1c0f4a37857f31c273e5f652b95ad96c71625 100644 (file)
--- a/jjb/config/definitions/jjb.yml
+++ b/jjb/config/definitions/jjb.yml
@@ -1,6 +1,6 @@
 - job:
     name: jenkins-job-builder
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false

diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml
index abda1bbfedcb894b3ccfa4b7b631ef21a16c0d49..665bfc213ef66fb58316a96aeb92625c0d550cbc 100644 (file)
--- a/teuthology-docs/config/definitions/teuthology-docs.yml
+++ b/teuthology-docs/config/definitions/teuthology-docs.yml
@@ -1,6 +1,6 @@
 - job:
-    name: teuthology-docs 
-    node: gitbuilder-cdep-deb-trusty-amd64-basic
+    name: teuthology-docs
+    node: trusty
     project-type: freestyle
     defaults: global
     disabled: false
@@ -14,8 +14,8 @@
       - github:
           url: https://github.com/ceph/teuthology
     logrotate:
-      daysToKeep: -1 
-      numToKeep: -1 
+      daysToKeep: -1
+      numToKeep: -1
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
 
@@ -26,7 +26,7 @@
       - git:
           url: https://github.com/ceph/teuthology.git
           branches:
-            - master 
+            - master
           browser: githubweb
           browser-url: https://github.com/ceph/teuthology.git
           timeout: 20