From c31dc75912c1595cea4793ccb56f6add24730bce Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 23 Jul 2020 10:46:00 -0700 Subject: [PATCH] Stop building arm container images and fix devstack tls 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 --- .zuul.yaml | 9 --------- .../templates/docker-compose.yaml.j2 | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 781afa2d6..548d014b4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -171,23 +171,14 @@ # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ]. Only works for 3-component tags. # Otherwise: ['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: . repository: zuul/nodepool-launcher target: nodepool-launcher tags: *imagetag - arch: - - linux/amd64 - - linux/arm64 - context: . repository: zuul/nodepool-builder target: nodepool-builder tags: *imagetag - arch: - - linux/amd64 - - linux/arm64 - job: name: nodepool-upload-image diff --git a/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2 b/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2 index 95a633bf2..dc6ee75c6 100644 --- a/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2 +++ b/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2 @@ -21,6 +21,8 @@ services: - /home/zuul:/home/zuul # logs (builder + dib build logs under /build) - /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: image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }} @@ -37,3 +39,5 @@ services: - /etc/nodepool:/etc/nodepool:ro # logs (builder + dib build logs under /build) - /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