Drop temp-debian nodeset
With Ifbe939f7e81fab75b68b2507595b482c8ef71a85 merged, the default
nodeset is an 8G debian-stretch VM, so we no longer need to specify
a nodeset on these jobs (they will inherit the default).
Change-Id: I8f283ffcd81c9886b817fde4a9f1efbcafc887c6
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3a04c84..6d9c908 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,6 +1,5 @@
- job:
name: gerrit-base
- nodeset: temp-debian
description: |
Base job for building Gerrit
diff --git a/zuul.d/test-jobs.yaml b/zuul.d/test-jobs.yaml
index 4c946f2..2067e6f 100644
--- a/zuul.d/test-jobs.yaml
+++ b/zuul.d/test-jobs.yaml
@@ -1,16 +1,8 @@
# Jobs used for testing roles in this repository
-# A temporary nodeset until we add this to zuul/config
-- nodeset:
- name: temp-debian
- nodes:
- - name: testnode
- label: debian-stretch-8G
-
- job:
name: test-ensure-bazelisk
run: playbooks/test-ensure-bazelisk.yaml
- nodeset: temp-debian
files:
- roles/ensure-bazelisk/.*
- playbooks/test-ensure-bazelisk.yaml
@@ -18,7 +10,6 @@
- job:
name: test-ensure-java
run: playbooks/test-ensure-java.yaml
- nodeset: temp-debian
files:
- roles/ensure-java/.*
- playbooks/test-ensure-java.yaml
@@ -26,7 +17,6 @@
- job:
name: test-install-build-essential
run: playbooks/test-install-build-essential.yaml
- nodeset: temp-debian
files:
- roles/install-build-essential/.*
- playbooks/test-install-build-essential.yaml