zuul/nodepool
Code Issues Proposed changes

Stop building arm container images and fix devstack tls

Browse Source 
Now that the underlying images are correctly being built for arm,
we see that several dependencies are missing wheels, and compiling
them under emulation takes a very long time.  Until we resolve that,
only build container images for amd64.

When devstack is enabled with TLS support
(If607caf301211181b4f37a2c7012f875de3d285c) the cloud config has a
reference to the CA in /opt/stack/data; thus we need to map it into
the builder/launcher container.  We missed this with testing in
Iacc71e9e744249c7ce585ab7131cc9e905d600ff because the image build
failed and thus the container-based job didn't run.

Change-Id: Ica9aecd457f8b6abcfd3cdbdb425d411f98ffeff
This commit is contained in:
James E. Blair 2020-07-23 10:46:00 -07:00
parent 898bfe1c6f
commit c31dc75912
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.zuul.yaml
View File

@ -171,23 +171,14 @@
# If zuul.tag is defined: [ '3', '3.19', '3.19.0' ]. Only works for 3-component tags. # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ]. Only works for 3-component tags.
# Otherwise: ['latest'] # Otherwise: ['latest']
&imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}" &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
arch:
- linux/amd64
- linux/arm64
- context: . - context: .
repository: zuul/nodepool-launcher repository: zuul/nodepool-launcher
target: nodepool-launcher target: nodepool-launcher
tags: *imagetag tags: *imagetag
arch:
- linux/amd64
- linux/arm64
- context: . - context: .
repository: zuul/nodepool-builder repository: zuul/nodepool-builder
target: nodepool-builder target: nodepool-builder
tags: *imagetag tags: *imagetag
arch:
- linux/amd64
- linux/arm64
- job: - job:
name: nodepool-upload-image name: nodepool-upload-image

4
playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2
View File

@ -21,6 +21,8 @@ services:
- /home/zuul:/home/zuul - /home/zuul:/home/zuul
# logs (builder + dib build logs under /build) # logs (builder + dib build logs under /build)
- /var/log/nodepool:/var/log/nodepool - /var/log/nodepool:/var/log/nodepool
# devstack tls-proxy puts CA here that is referenced by cloud config
- /opt/stack/data:/opt/stack/data:ro
nodepool-launcher: nodepool-launcher:
image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }} image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }}
@ -37,3 +39,5 @@ services:
- /etc/nodepool:/etc/nodepool:ro - /etc/nodepool:/etc/nodepool:ro
# logs (builder + dib build logs under /build) # logs (builder + dib build logs under /build)
- /var/log/nodepool:/var/log/nodepool - /var/log/nodepool:/var/log/nodepool
# devstack tls-proxy puts CA here that is referenced by cloud config
- /opt/stack/data:/opt/stack/data:ro