Merge "Drop pip-and-virtualenv from images"

This commit is contained in:
Zuul 2020-06-15 00:29:56 +00:00 committed by Gerrit Code Review
commit 1636b1f98a
1 changed files with 8 additions and 8 deletions

View File

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