From 2e6537a5f9422fd90670b71cd683ce5183ee057c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 11 Jan 2018 11:32:06 +1100 Subject: [PATCH] Revert "Pause builds for dib 2.10 release" This reverts commit 834526c39a4bc0d3c0ac0e438bd719a65c7b8565 and 2f2bf84b19fd50c3f4b1538956412bf6dbe33ee8. Change-Id: Id4bf6350c9787fc1b595c4b4d9d6fc0226d6be26 Depends-On: I419dbdf4682394db68974944af1e5c432f3e0565 --- nodepool/nl01.openstack.org.yaml | 7 ------- nodepool/nl02.openstack.org.yaml | 7 ------- nodepool/nodepool.yaml | 7 ------- 3 files changed, 21 deletions(-) diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index c077234960..c94d7fb3be 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -314,7 +314,6 @@ providers: diskimages: - name: centos-7 - pause: true elements: - centos-minimal - vm @@ -333,7 +332,6 @@ diskimages: DIB_GRUB_TIMEOUT: '0' DIB_EPEL_DISABLED: '1' - name: debian-jessie - pause: true elements: - debian-minimal - vm @@ -353,7 +351,6 @@ diskimages: DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ DIB_GRUB_TIMEOUT: '0' - name: fedora-26 - pause: true elements: - fedora-minimal - vm @@ -372,7 +369,6 @@ diskimages: QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' - name: gentoo - pause: true elements: - gentoo - vm @@ -393,7 +389,6 @@ diskimages: GENTOO_PYTHON_TARGETS: 'python2_7 python3_5' GENTOO_PYTHON_ACTIVE_VERSION: python3.5 - name: opensuse-423 - pause: true elements: - opensuse-minimal - vm @@ -411,7 +406,6 @@ diskimages: QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' - name: ubuntu-trusty - pause: true elements: - ubuntu-minimal - vm @@ -432,7 +426,6 @@ diskimages: DIB_GRUB_TIMEOUT: '0' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-xenial - pause: true elements: - ubuntu-minimal - vm diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index 7012ee6f86..d1509fa28e 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -411,7 +411,6 @@ providers: diskimages: - name: centos-7 - pause: true elements: - centos-minimal - vm @@ -430,7 +429,6 @@ diskimages: DIB_GRUB_TIMEOUT: '0' DIB_EPEL_DISABLED: '1' - name: debian-jessie - pause: true elements: - debian-minimal - vm @@ -450,7 +448,6 @@ diskimages: DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ DIB_GRUB_TIMEOUT: '0' - name: fedora-26 - pause: true elements: - fedora-minimal - vm @@ -469,7 +466,6 @@ diskimages: QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' - name: gentoo - pause: true elements: - gentoo - vm @@ -490,7 +486,6 @@ diskimages: GENTOO_PYTHON_TARGETS: 'python2_7 python3_5' GENTOO_PYTHON_ACTIVE_VERSION: python3.5 - name: opensuse-423 - pause: true elements: - opensuse-minimal - vm @@ -508,7 +503,6 @@ diskimages: QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' - name: ubuntu-trusty - pause: true elements: - ubuntu-minimal - vm @@ -529,7 +523,6 @@ diskimages: DIB_GRUB_TIMEOUT: '0' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-xenial - pause: true elements: - ubuntu-minimal - vm diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index b527e7b2af..412a1f5e53 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -970,7 +970,6 @@ targets: diskimages: - name: debian-jessie - pause: true elements: - debian-minimal - vm @@ -990,7 +989,6 @@ diskimages: DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ DIB_GRUB_TIMEOUT: '0' - name: ubuntu-trusty - pause: true elements: - ubuntu-minimal - vm @@ -1012,7 +1010,6 @@ diskimages: DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-xenial - pause: true elements: - ubuntu-minimal - vm @@ -1035,7 +1032,6 @@ diskimages: DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: centos-7 - pause: true elements: - centos-minimal - vm @@ -1054,7 +1050,6 @@ diskimages: DIB_GRUB_TIMEOUT: '0' DIB_EPEL_DISABLED: '1' - name: fedora-26 - pause: true elements: - fedora-minimal - vm @@ -1073,7 +1068,6 @@ diskimages: QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' - name: gentoo - pause: true elements: - gentoo - vm @@ -1094,7 +1088,6 @@ diskimages: GENTOO_PYTHON_TARGETS: 'python2_7 python3_5' GENTOO_PYTHON_ACTIVE_VERSION: python3.5 - name: opensuse-423 - pause: true elements: - opensuse-minimal - vm