nodepool-elements: Use venv for utilities
Since all platforms have Python 3, use the new ensure-venv element from the dependent change to install bindep and os-testr. Since we are no longer using pip to install anything during the builder, this drops the dependency on pip-and-virtualenv from nodepool-base. Avoiding this element is our long-term goal, as it's modification to system state are problematic in a number of ways. To maintain the status-quo, the pip-and-virtualenv element is added explicitly to each build's element list, with a note on it's future. The current plan for backwards compatability is to replicate the environment pip-and-virtualenv provides in a base role/job that can be optionally included. To test this, provide a new node type "ubuntu-bionic-plain" that will not include the pip-and-virtualenv element. This is put on just one provider (rax) to minimise impact. The dependent-change (and a dib release) is required before merge so the ensure-venv element is available. Depends-On: https://review.opendev.org/707513 Change-Id: I85438baf5bb31790a56fe5b38327361f0a2398e9
This commit is contained in:
@@ -1,2 +1,3 @@
|
|||||||
|
ensure-venv
|
||||||
openssh-server
|
openssh-server
|
||||||
package-installs
|
package-installs
|
||||||
|
|||||||
@@ -22,5 +22,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|||||||
fi
|
fi
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
$DIB_PYTHON_VIRTUALENV /usr/bindep-env
|
python3 -m venv /usr/bindep-env
|
||||||
/usr/bindep-env/bin/pip install bindep
|
/usr/bindep-env/bin/pip install bindep
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
|
ensure-venv
|
||||||
package-installs
|
package-installs
|
||||||
pip-and-virtualenv
|
|
||||||
zuul-worker
|
zuul-worker
|
||||||
|
|||||||
@@ -18,5 +18,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|||||||
fi
|
fi
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
$DIB_PYTHON_VIRTUALENV /usr/os-testr-env
|
python3 -m venv /usr/os-testr-env
|
||||||
/usr/os-testr-env/bin/pip install os-testr
|
/usr/os-testr-env/bin/pip install os-testr
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ labels:
|
|||||||
min-ready: 10
|
min-ready: 10
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
min-ready: 1
|
min-ready: 1
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
@@ -63,6 +64,8 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 140
|
max-servers: 140
|
||||||
@@ -112,6 +115,11 @@ providers:
|
|||||||
flavor-name: 'Performance'
|
flavor-name: 'Performance'
|
||||||
diskimage: ubuntu-bionic
|
diskimage: ubuntu-bionic
|
||||||
key-name: infra-root-keys-2018-06-15
|
key-name: infra-root-keys-2018-06-15
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
min-ram: 8192
|
||||||
|
flavor-name: 'Performance'
|
||||||
|
diskimage: ubuntu-bionic-plain
|
||||||
|
key-name: infra-root-keys-2018-06-15
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
flavor-name: 'Performance'
|
flavor-name: 'Performance'
|
||||||
@@ -154,3 +162,4 @@ diskimages:
|
|||||||
- name: opensuse-tumbleweed
|
- name: opensuse-tumbleweed
|
||||||
- name: ubuntu-bionic
|
- name: ubuntu-bionic
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
|||||||
@@ -72,19 +72,43 @@ providers:
|
|||||||
region-name: 'DFW'
|
region-name: 'DFW'
|
||||||
cloud: rax
|
cloud: rax
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
diskimages: *provider_diskimages
|
diskimages: &rax_provider_diskimages
|
||||||
|
# NOTE(ianw) 2020-02-17 : duplicated to add ubuntu-bionic-plain
|
||||||
|
# while we work to remove pip-and-virtualenv
|
||||||
|
- name: centos-7
|
||||||
|
config-drive: true
|
||||||
|
- name: centos-8
|
||||||
|
config-drive: true
|
||||||
|
- name: debian-buster
|
||||||
|
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
|
||||||
|
config-drive: true
|
||||||
|
- name: opensuse-tumbleweed
|
||||||
|
config-drive: true
|
||||||
|
- name: ubuntu-bionic
|
||||||
|
config-drive: true
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
config-drive: true
|
||||||
|
- name: ubuntu-xenial
|
||||||
|
config-drive: true
|
||||||
|
|
||||||
- name: rax-iad
|
- name: rax-iad
|
||||||
region-name: 'IAD'
|
region-name: 'IAD'
|
||||||
cloud: rax
|
cloud: rax
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
diskimages: *provider_diskimages
|
diskimages: *rax_provider_diskimages
|
||||||
|
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
region-name: 'ORD'
|
region-name: 'ORD'
|
||||||
cloud: rax
|
cloud: rax
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
diskimages: *provider_diskimages
|
diskimages: *rax_provider_diskimages
|
||||||
|
|
||||||
- name: vexxhost-ca-ymq-1
|
- name: vexxhost-ca-ymq-1
|
||||||
region-name: 'ca-ymq-1'
|
region-name: 'ca-ymq-1'
|
||||||
@@ -129,6 +153,9 @@ diskimages:
|
|||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
- epel
|
- epel
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
DIB_CHECKSUM: '1'
|
DIB_CHECKSUM: '1'
|
||||||
@@ -152,6 +179,9 @@ diskimages:
|
|||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
- epel
|
- epel
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
DIB_CHECKSUM: '1'
|
DIB_CHECKSUM: '1'
|
||||||
@@ -174,6 +204,9 @@ diskimages:
|
|||||||
- cache-devstack
|
- cache-devstack
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: stretch
|
release: stretch
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -202,6 +235,9 @@ diskimages:
|
|||||||
- cache-devstack
|
- cache-devstack
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: buster
|
release: buster
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -237,6 +273,7 @@ diskimages:
|
|||||||
fstab:
|
fstab:
|
||||||
options: "defaults,nobarrier,noatime"
|
options: "defaults,nobarrier,noatime"
|
||||||
fsck-passno: 1
|
fsck-passno: 1
|
||||||
|
|
||||||
- name: fedora-30
|
- name: fedora-30
|
||||||
pause: true
|
pause: true
|
||||||
python-path: /usr/bin/python3
|
python-path: /usr/bin/python3
|
||||||
@@ -250,6 +287,9 @@ diskimages:
|
|||||||
- initialize-urandom
|
- initialize-urandom
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: 30
|
release: 30
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -270,6 +310,9 @@ diskimages:
|
|||||||
- nodepool-base
|
- nodepool-base
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
DIB_CHECKSUM: '1'
|
DIB_CHECKSUM: '1'
|
||||||
@@ -293,6 +336,9 @@ diskimages:
|
|||||||
- cache-devstack
|
- cache-devstack
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: '15.1'
|
release: '15.1'
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -315,6 +361,9 @@ diskimages:
|
|||||||
- cache-devstack
|
- cache-devstack
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: 'tumbleweed'
|
release: 'tumbleweed'
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -337,6 +386,9 @@ diskimages:
|
|||||||
- cache-devstack
|
- cache-devstack
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: bionic
|
release: bionic
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -364,6 +416,9 @@ diskimages:
|
|||||||
- initialize-urandom
|
- initialize-urandom
|
||||||
- growroot
|
- growroot
|
||||||
- infra-package-needs
|
- infra-package-needs
|
||||||
|
# NOTE(ianw) 2020-02-17 : we are working to move this into job
|
||||||
|
# configuration
|
||||||
|
- pip-and-virtualenv
|
||||||
release: xenial
|
release: xenial
|
||||||
env-vars:
|
env-vars:
|
||||||
TMPDIR: /opt/dib_tmp
|
TMPDIR: /opt/dib_tmp
|
||||||
@@ -379,3 +434,32 @@ diskimages:
|
|||||||
GIT_HTTP_LOW_SPEED_TIME: '300'
|
GIT_HTTP_LOW_SPEED_TIME: '300'
|
||||||
GIT_HTTP_LOW_SPEED_LIMIT: '1000'
|
GIT_HTTP_LOW_SPEED_LIMIT: '1000'
|
||||||
DIB_SHOW_IMAGE_USAGE: '1'
|
DIB_SHOW_IMAGE_USAGE: '1'
|
||||||
|
# NOTE(ianw) 2020-02-17 : this is an alternative image without the
|
||||||
|
# pip-and-virtualenv element we can test ansible roles to achieve
|
||||||
|
# full backwards-compatability with.
|
||||||
|
- name: ubuntu-bionic-plain
|
||||||
|
pause: false
|
||||||
|
elements:
|
||||||
|
- ubuntu-minimal
|
||||||
|
- vm
|
||||||
|
- simple-init
|
||||||
|
- openstack-repos
|
||||||
|
- nodepool-base
|
||||||
|
- cache-devstack
|
||||||
|
- growroot
|
||||||
|
- infra-package-needs
|
||||||
|
release: bionic
|
||||||
|
env-vars:
|
||||||
|
TMPDIR: /opt/dib_tmp
|
||||||
|
DIB_CHECKSUM: '1'
|
||||||
|
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||||
|
DIB_JOURNAL_SIZE: '512'
|
||||||
|
DIB_APT_LOCAL_CACHE: '0'
|
||||||
|
DIB_DISABLE_APT_CLEANUP: '1'
|
||||||
|
DIB_GRUB_TIMEOUT: '0'
|
||||||
|
DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
|
||||||
|
DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
|
||||||
|
DIB_DEBIAN_COMPONENTS: 'main,universe'
|
||||||
|
GIT_HTTP_LOW_SPEED_TIME: '300'
|
||||||
|
GIT_HTTP_LOW_SPEED_LIMIT: '1000'
|
||||||
|
DIB_SHOW_IMAGE_USAGE: '1'
|
||||||
|
|||||||
Reference in New Issue
Block a user