From cc19b638d6c73e1973544128699f3872c589d051 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 8 Apr 2020 12:38:18 +1000
Subject: [PATCH] Move suse builds to nb04, drop pip-and-virtualenv

Move these images to nb04, the container-based builder.  Pause them on
the other builders.  Due to upstream changes the pip-and-virtualenv
element doesn't work on them any more; remove it.  Work is in progress
to fix our base jobs to operate on platforms such as this, but in the
mean time devstack tests should work.

Change-Id: I0b5ccf6f0b441bdb752b5f066b69edda92f4b37a
---
 nodepool/nb04.opendev.org.yaml | 10 ++--------
 nodepool/nodepool.yaml         | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
index 5b113508c3..abe1bc9978 100644
--- a/nodepool/nb04.opendev.org.yaml
+++ b/nodepool/nb04.opendev.org.yaml
@@ -370,7 +370,7 @@ diskimages:
       ZUUL_USER_SSH_PUBLIC_KEY: |
         ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDh5u0DWNi0d3uqI82izAxVTUTrGl36L3szEqV9WrilGmxaTtp9X7HrktJ5J+rvxQqz39llTf1v7iYA4CNKto/48RBAB0mKEEI4x4iw+fu/BLU7nu7ewSfXLUxHahxaTgIk2KcbegknD5NzMjalyfNfgTPDGv8BjwHeeNdZmJMBvPFGu6fO48M4yK1tiQn0kAkaH4oII/M4pyF8vy9tPTODAD7RvnMvQAb08LZZvE/IPzJAHNXFRb1v+DBa38fOvdyaz/nibrsxiOWZxQVLgjYciUeDy1xvXADaWlqvxmLy+90LHbJFbGxK4AN0mWfwBiUMVyxZjkun39pjTNl2k09OhOq+R52UqnehMc4eBdZCddnCUq4/efbFCJkqe5wY+SE8fYybJjauUL64zyrwf6yfWkXvPVHWa9Y+NCmvH8PCBUcsQnwO7l/Yb4N+8+u6zkODyuc9wLAY+DpnptE3plXtvUs5negC4fvJSnOHpWXuoi9yzp7IlPf6fSjMMDQo0JjCYJwazdzqrIH2VSCcfHAqWF0ECR8IgwZV1bp0xFe0UN0Gjsgkozqf8rvs1AYyTSeD19Wg9j+crTke8E1sfoI/qFzHwzBQFKJ+2l0cs7pZWJBARlhbt1j1IouS2aH+74xwsavRhBz4IsFTPqWiP6JTrgk5cgKRnTqInzNfdaLeUw== zuul-worker@openstack.org
   - name: opensuse-15
-    pause: true
+    pause: false
     elements:
       - opensuse-minimal
       - vm
@@ -380,9 +380,6 @@ diskimages:
       - cache-devstack
       - growroot
       - infra-package-needs
-      # NOTE(ianw) 2020-02-17 : we are working to move this into job
-      # configuration
-      - pip-and-virtualenv
     release: '15.1'
     env-vars:
       TMPDIR: /opt/dib_tmp
@@ -395,7 +392,7 @@ diskimages:
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
       DIB_SHOW_IMAGE_USAGE: '1'
   - name: opensuse-tumbleweed
-    pause: true
+    pause: false
     elements:
       - opensuse-minimal
       - vm
@@ -405,9 +402,6 @@ diskimages:
       - cache-devstack
       - growroot
       - infra-package-needs
-      # NOTE(ianw) 2020-02-17 : we are working to move this into job
-      # configuration
-      - pip-and-virtualenv
     release: 'tumbleweed'
     env-vars:
       TMPDIR: /opt/dib_tmp
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 371d37e601..18cb1b4c3b 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -369,7 +369,7 @@ diskimages:
       ZUUL_USER_SSH_PUBLIC_KEY: |
         ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDh5u0DWNi0d3uqI82izAxVTUTrGl36L3szEqV9WrilGmxaTtp9X7HrktJ5J+rvxQqz39llTf1v7iYA4CNKto/48RBAB0mKEEI4x4iw+fu/BLU7nu7ewSfXLUxHahxaTgIk2KcbegknD5NzMjalyfNfgTPDGv8BjwHeeNdZmJMBvPFGu6fO48M4yK1tiQn0kAkaH4oII/M4pyF8vy9tPTODAD7RvnMvQAb08LZZvE/IPzJAHNXFRb1v+DBa38fOvdyaz/nibrsxiOWZxQVLgjYciUeDy1xvXADaWlqvxmLy+90LHbJFbGxK4AN0mWfwBiUMVyxZjkun39pjTNl2k09OhOq+R52UqnehMc4eBdZCddnCUq4/efbFCJkqe5wY+SE8fYybJjauUL64zyrwf6yfWkXvPVHWa9Y+NCmvH8PCBUcsQnwO7l/Yb4N+8+u6zkODyuc9wLAY+DpnptE3plXtvUs5negC4fvJSnOHpWXuoi9yzp7IlPf6fSjMMDQo0JjCYJwazdzqrIH2VSCcfHAqWF0ECR8IgwZV1bp0xFe0UN0Gjsgkozqf8rvs1AYyTSeD19Wg9j+crTke8E1sfoI/qFzHwzBQFKJ+2l0cs7pZWJBARlhbt1j1IouS2aH+74xwsavRhBz4IsFTPqWiP6JTrgk5cgKRnTqInzNfdaLeUw== zuul-worker@openstack.org
   - name: opensuse-15
-    pause: false
+    pause: true
     elements:
       - opensuse-minimal
       - vm
@@ -379,9 +379,6 @@ diskimages:
       - cache-devstack
       - growroot
       - infra-package-needs
-      # NOTE(ianw) 2020-02-17 : we are working to move this into job
-      # configuration
-      - pip-and-virtualenv
     release: '15.1'
     env-vars:
       TMPDIR: /opt/dib_tmp
@@ -394,7 +391,7 @@ diskimages:
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
       DIB_SHOW_IMAGE_USAGE: '1'
   - name: opensuse-tumbleweed
-    pause: false
+    pause: true
     elements:
       - opensuse-minimal
       - vm
@@ -404,9 +401,6 @@ diskimages:
       - cache-devstack
       - growroot
       - infra-package-needs
-      # NOTE(ianw) 2020-02-17 : we are working to move this into job
-      # configuration
-      - pip-and-virtualenv
     release: 'tumbleweed'
     env-vars:
       TMPDIR: /opt/dib_tmp