Browse Source

Merge "CI: add Centos 8 and Ubuntu jobs for aarch64"

tags/10.0.0.0rc1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
3883d3a01d
5 changed files with 32 additions and 5 deletions
  1. +12
    -0
      .zuul.d/base.yaml
  2. +9
    -0
      .zuul.d/centos.yaml
  3. +1
    -5
      .zuul.d/debian.yaml
  4. +9
    -0
      .zuul.d/ubuntu.yaml
  5. +1
    -0
      tests/templates/template_overrides.j2

+ 12
- 0
.zuul.d/base.yaml View File

@@ -43,12 +43,24 @@
- name: primary
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


+ 9
- 0
.zuul.d/centos.yaml View File

@@ -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:
@@ -69,6 +72,12 @@
base_distro: centos
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


+ 1
- 5
.zuul.d/debian.yaml View File

@@ -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


+ 9
- 0
.zuul.d/ubuntu.yaml View File

@@ -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:
@@ -57,6 +60,12 @@
base_distro: ubuntu
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


+ 1
- 0
tests/templates/template_overrides.j2 View File

@@ -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 %}


Loading…
Cancel
Save