diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-09 14:50:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-09 14:50:33 +0000 |
| commit | 3883d3a01dec974b6b0bca7784a9989510cd7d92 (patch) | |
| tree | 1ed3d28c45507a33d06956e9d74967a265c9acb4 | |
| parent | 9141837a6938b372f735ced13464447249233e36 (diff) | |
| parent | 584da0675127d6b692a84bacfaa789b26a332ccb (diff) | |
| download | kolla-3883d3a01dec974b6b0bca7784a9989510cd7d92.tar.gz kolla-3883d3a01dec974b6b0bca7784a9989510cd7d92.zip | |
Merge "CI: add Centos 8 and Ubuntu jobs for aarch64"
| -rw-r--r-- | .zuul.d/base.yaml | 12 | ||||
| -rw-r--r-- | .zuul.d/centos.yaml | 9 | ||||
| -rw-r--r-- | .zuul.d/debian.yaml | 6 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 9 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 1 |
5 files changed, 32 insertions, 5 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index f8a7c7c12..73c9d4a76 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -44,11 +44,23 @@ label: debian-buster - nodeset: + name: kolla-centos8-aarch64 + nodes: + - name: primary + label: centos-8-arm64 + +- nodeset: name: kolla-debian-buster-aarch64 nodes: - name: primary label: debian-buster-arm64 +- nodeset: + name: kolla-ubuntu-bionic-aarch64 + nodes: + - name: primary + label: ubuntu-bionic-arm64 + - job: name: kolla-base parent: base diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index f219b1c3d..960f50c9f 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -28,6 +28,9 @@ files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.* - kolla-ansible-centos8-source-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* + check-arm64: + jobs: + - kolla-build-centos8-source-aarch64 gate: queue: kolla jobs: @@ -70,6 +73,12 @@ install_type: source - job: + name: kolla-build-centos8-source-aarch64 + parent: kolla-build-centos8-source + nodeset: kolla-centos8-aarch64 + voting: false + +- job: name: kolla-publish-centos8-source parent: kolla-build-centos8-source post-run: tests/playbooks/publish.yml diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index 64058d69c..37f70618d 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -29,12 +29,8 @@ - job: name: kolla-build-debian-source-aarch64 - parent: kolla-base + parent: kolla-build-debian-source nodeset: kolla-debian-buster-aarch64 - voting: false - vars: - base_distro: debian - install_type: source - job: name: kolla-build-debian-binary diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index daae673d5..4235f3543 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -16,6 +16,9 @@ files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - kolla-ansible-ubuntu-source-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* + check-arm64: + jobs: + - kolla-build-ubuntu-source-aarch64 gate: queue: kolla jobs: @@ -58,6 +61,12 @@ install_type: source - job: + name: kolla-build-ubuntu-source-aarch64 + parent: kolla-build-ubuntu-source + nodeset: kolla-ubuntu-bionic-aarch64 + voting: false + +- job: name: kolla-publish-ubuntu-source parent: kolla-build-ubuntu-source post-run: tests/playbooks/publish.yml diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index d7ea2dcb9..d90524c1f 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -95,6 +95,7 @@ RUN sed -i -e "s|http://deb.debian.org|http://{{ nodepool_mirror_host }}|" \ RUN sed -i -e "s|mirror://mirrors.ubuntu.com/mirrors.txt|http://{{ nodepool_mirror_host }}/ubuntu/|" \ -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \ + -e "s|http://ports.ubuntu.com|http://{{ nodepool_mirror_host }}/ubuntu-ports|" \ /etc/apt/sources.list {% raw %} |