From 98ba436966cea7fc9eff7fb8280043e3af6fd617 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 13 Mar 2020 16:22:08 +1100
Subject: [PATCH] Revert "Move fedora-30 builds to nb01.opendev.org"

This reverts commit 9d7592df75a84cac484457e62dce917af80b092a which was
meant to make nb01.opendev.org the only builder of fedora-30, but did
not quite work as expected.  This replicated what we do on the ARM64
builds; but what I missed was that the ARM builds have exclusive use
of the ARM clouds -- in this case the new nb01.opendev.org thought
that all the other images in the existing clouds were foreign and
tried to delete them.

Take a different approach; replicate the nodepool.yaml file to a
nb01.opendev.org specific one, but pause everything *but* the
fedora-30 builds.  This should make the builder leave everything else
alone, and just try building Fedora, which is what we want for the
initial POC.

Change-Id: I2ccb6aaad5866561fd6ec4118c718ee131c3a5f0
---
 nodepool/nb01.opendev.org.yaml | 101 ---------------------------------
 nodepool/nodepool.yaml         |  32 +++++++++++
 2 files changed, 32 insertions(+), 101 deletions(-)
 delete mode 100644 nodepool/nb01.opendev.org.yaml

diff --git a/nodepool/nb01.opendev.org.yaml b/nodepool/nb01.opendev.org.yaml
deleted file mode 100644
index 84be67e2ff..0000000000
--- a/nodepool/nb01.opendev.org.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-elements-dir: /opt/project-config/nodepool/elements
-images-dir: /opt/nodepool_dib
-
-zookeeper-servers:
-  - host: zk01.openstack.org
-    port: 2181
-  - host: zk02.openstack.org
-    port: 2181
-  - host: zk03.openstack.org
-    port: 2181
-
-providers:
-  - name: ovh-bhs1
-    region-name: 'BHS1'
-    cloud: ovh
-    rate: 0.1
-    diskimages: &provider_diskimages
-      - name: fedora-30
-        config-drive: true
-
-  - name: ovh-gra1
-    region-name: 'GRA1'
-    cloud: ovh
-    rate: 0.1
-    diskimages: *provider_diskimages
-
-  - name: inap-mtl01
-    region-name: 'mtl01'
-    cloud: inap
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-dfw
-    region-name: 'DFW'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-iad
-    region-name: 'IAD'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-ord
-    region-name: 'ORD'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: vexxhost-ca-ymq-1
-    region-name: 'ca-ymq-1'
-    cloud: vexxhost
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: vexxhost-sjc1
-    region-name: 'sjc1'
-    cloud: vexxhost
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: limestone-regionone
-    region-name: 'RegionOne'
-    cloud: limestone
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: openedge-us-east
-    region-name: 'us-east'
-    cloud: openedge
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-diskimages:
-  - name: fedora-30
-    pause: true
-    python-path: /usr/bin/python3
-    elements:
-      - fedora-minimal
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - cache-devstack
-      - initialize-urandom
-      - growroot
-      - infra-package-needs
-      # NOTE(ianw) 2020-02-17 : we are working to move this into job
-      # configuration
-      - pip-and-virtualenv
-    release: 30
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_CHECKSUM: '1'
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_JOURNAL_SIZE: '512'
-      DIB_GRUB_TIMEOUT: '0'
-      GIT_HTTP_LOW_SPEED_TIME: '300'
-      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
-      DIB_SHOW_IMAGE_USAGE: '1'
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 6836022077..c2cbd52b6c 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -43,6 +43,8 @@ providers:
         config-drive: true
       - name: debian-stretch
         config-drive: true
+      - name: fedora-30
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -81,6 +83,8 @@ providers:
         config-drive: true
       - name: debian-stretch
         config-drive: true
+      - name: fedora-30
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -270,6 +274,34 @@ diskimages:
                       options: "defaults,nobarrier,noatime"
                       fsck-passno: 1
 
+# NOTE(ianw) : currently only building on nb01.opendev.org; see that
+# config file.
+  - name: fedora-30
+    pause: true
+    python-path: /usr/bin/python3
+    elements:
+      - fedora-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - initialize-urandom
+      - growroot
+      - infra-package-needs
+      # NOTE(ianw) 2020-02-17 : we are working to move this into job
+      # configuration
+      - pip-and-virtualenv
+    release: 30
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
+      DIB_GRUB_TIMEOUT: '0'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+      DIB_SHOW_IMAGE_USAGE: '1'
   - name: gentoo-17-0-systemd
     pause: false
     elements: