calamari: Use small machines

We do not need the huge machines for the calamari setup tasks, use small
machines instead.

Also use centos7 node instead of trusty one, nodejs bits seems to be
somewhat broken in trusty.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
index 61d71eb3c50972e5cd696de706cd594e65725c69..6f73269115f29f41d8386f0793c302cf3e91d9a9 100644 (file)
--- a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
+++ b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
@@ -3,7 +3,7 @@
     description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the calamari-clients-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
+    node: small && centos7
     display-name: 'calamari-clients-setup'
     logrotate:
       daysToKeep: -1

diff --git a/calamari-setup/config/definitions/calamari-setup.yml b/calamari-setup/config/definitions/calamari-setup.yml
index 8aab7e2e4a11543e27d7792f51cee7282850790b..d9b48c33af1dc3b921199b628933c0000e6d5d6e 100644 (file)
--- a/calamari-setup/config/definitions/calamari-setup.yml
+++ b/calamari-setup/config/definitions/calamari-setup.yml
@@ -3,7 +3,7 @@
     description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the calamari-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
+    node: small && trusty
     display-name: 'calamari-setup'
     logrotate:
       daysToKeep: -1