Merge "Drop pip-and-virtualenv from images"

nodepool/nodepool.yaml

@@ -156,7 +156,7 @@ diskimages:
   ############ CentOS and Fedora #############
 
   - name: centos-7
-    parent: base-with-pip
+    parent: base
     pause: false
     elements:
       - centos-minimal
@@ -166,7 +166,7 @@ diskimages:
       DIB_EPEL_DISABLED: '1'
 
   - name: centos-8
-    parent: base-with-pip
+    parent: base
     pause: false
     python-path: /usr/bin/python3
     release: '8'
@@ -178,7 +178,7 @@ diskimages:
       DIB_EPEL_DISABLED: '1'
 
   - name: fedora-30
-    parent: base-with-pip
+    parent: base
     pause: false
     python-path: /usr/bin/python3
     elements:
@@ -198,7 +198,7 @@ diskimages:
   ############ Debian #############
 
   - name: debian-stretch
-    parent: base-debuntu-with-pip
+    parent: base-debuntu
     pause: false
     elements:
       - debian-minimal
@@ -211,7 +211,7 @@ diskimages:
       DIB_DEBIAN_SECURITY_SUBPATH: ''
 
   - name: debian-buster
-    parent: base-debuntu-with-pip
+    parent: base-debuntu
     pause: false
     elements:
       - debian-minimal
@@ -246,7 +246,7 @@ diskimages:
   ############ Gentoo #############
 
   - name: gentoo-17-0-systemd
-    parent: base-with-pip
+    parent: base
     pause: true
     elements:
       - gentoo
@@ -284,7 +284,7 @@ diskimages:
   ############ Ubuntu #############
 
   - name: ubuntu-bionic
-    parent: base-debuntu-with-pip
+    parent: base-debuntu
     pause: false
     elements:
       - ubuntu-minimal
@@ -306,7 +306,7 @@ diskimages:
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-xenial
-    parent: base-debuntu-with-pip
+    parent: base-debuntu
     pause: false
     elements:
       - ubuntu-minimal