CI: separate image builds into a non-voting job
Disk and container image builds tend to be fairly unreliable. With 3 voting seed jobs all building images, this can introduce instability into the CI jobs. This change adds a non-voting kayobe-seed-images-centos8s job, which does the following: * Builds IPA images * Builds an overcloud host image * Builds a base container image Similar Rocky and Ubuntu jobs are added to the experimental pipeline, and may be run by commenting 'check experimental' in gerrit. The existing kayobe-seed-* jobs no longer build images. Change-Id: Idecda342f3ab86733e8d59061458d44af834dbb0
This commit is contained in:
parent
0cd0f05781
commit
a7ee3ac5c8
@ -32,3 +32,11 @@ pip_trusted_hosts:
|
|||||||
# are using for SSH to be removed. Use a dummy interface.
|
# are using for SSH to be removed. Use a dummy interface.
|
||||||
aio_bridge_ports:
|
aio_bridge_ports:
|
||||||
- dummy1
|
- dummy1
|
||||||
|
|
||||||
|
# Build seed deployment images (IPA) with extra-hardware element
|
||||||
|
ipa_build_images: {{ build_images }}
|
||||||
|
ipa_build_dib_elements_extra:
|
||||||
|
- "extra-hardware"
|
||||||
|
|
||||||
|
# Build overcloud host image.
|
||||||
|
overcloud_dib_build_host_images: {{ build_images }}
|
||||||
|
@ -25,16 +25,18 @@
|
|||||||
src: globals.yml.j2
|
src: globals.yml.j2
|
||||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||||
|
|
||||||
- name: Ensure bifrost overrides directory exists
|
- block:
|
||||||
file:
|
- name: Ensure bifrost overrides directory exists
|
||||||
path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
|
file:
|
||||||
state: "directory"
|
path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
|
||||||
|
state: "directory"
|
||||||
|
|
||||||
# NOTE(mgoddard): Use dib.yml, since it takes precedence over bifrost.yml.
|
# NOTE(mgoddard): Use dib.yml, since it takes precedence over bifrost.yml.
|
||||||
- name: Ensure bifrost overrides file exists
|
- name: Ensure bifrost overrides file exists
|
||||||
template:
|
template:
|
||||||
src: bifrost-overrides.yml.j2
|
src: bifrost-overrides.yml.j2
|
||||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/dib.yml"
|
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/dib.yml"
|
||||||
|
when: not build_images
|
||||||
|
|
||||||
- name: Ensure kayobe is installed
|
- name: Ensure kayobe is installed
|
||||||
shell:
|
shell:
|
||||||
|
@ -10,21 +10,22 @@
|
|||||||
cmd: "{{ kayobe_src_dir }}/dev/seed-deploy.sh &> {{ logs_dir }}/ansible/seed-deploy"
|
cmd: "{{ kayobe_src_dir }}/dev/seed-deploy.sh &> {{ logs_dir }}/ansible/seed-deploy"
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
|
|
||||||
# NOTE(mgoddard): The stack user cannot read the kolla source code, which
|
- block:
|
||||||
# lives in the zuul user's home directory. Copy it to a readable location.
|
# NOTE(mgoddard): The stack user cannot read the kolla source code, which
|
||||||
- name: Create a readable copy of kolla source code
|
# lives in the zuul user's home directory. Copy it to a readable location.
|
||||||
become: true
|
- name: Create a readable copy of kolla source code
|
||||||
copy:
|
become: true
|
||||||
src: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
copy:
|
||||||
dest: /tmp
|
src: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
||||||
owner: stack
|
dest: /tmp
|
||||||
group: stack
|
owner: stack
|
||||||
remote_src: true
|
group: stack
|
||||||
|
remote_src: true
|
||||||
|
|
||||||
- name: Ensure base container image is built
|
- name: Ensure base container image is built
|
||||||
shell:
|
shell:
|
||||||
cmd: >
|
cmd: >
|
||||||
source {{ kayobe_src_dir }}/dev/environment-setup.sh &&
|
source {{ kayobe_src_dir }}/dev/environment-setup.sh &&
|
||||||
kayobe seed container image build ^base &> {{ logs_dir }}/ansible/container-image-build
|
kayobe seed container image build ^base &> {{ logs_dir }}/ansible/container-image-build
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
when: ansible_os_family == 'RedHat'
|
when: build_images
|
||||||
|
@ -160,6 +160,8 @@
|
|||||||
pre-run: playbooks/kayobe-seed-base/pre.yml
|
pre-run: playbooks/kayobe-seed-base/pre.yml
|
||||||
run: playbooks/kayobe-seed-base/run.yml
|
run: playbooks/kayobe-seed-base/run.yml
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
|
vars:
|
||||||
|
build_images: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kayobe-seed-centos8s
|
name: kayobe-seed-centos8s
|
||||||
@ -176,6 +178,32 @@
|
|||||||
parent: kayobe-seed-base
|
parent: kayobe-seed-base
|
||||||
nodeset: kayobe-ubuntu-focal
|
nodeset: kayobe-ubuntu-focal
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: kayobe-seed-images-base
|
||||||
|
parent: kayobe-seed-base
|
||||||
|
description: |
|
||||||
|
Base job for testing seed image builds.
|
||||||
|
|
||||||
|
Configures the primary VM as a seed.
|
||||||
|
voting: false
|
||||||
|
vars:
|
||||||
|
build_images: true
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: kayobe-seed-images-centos8s
|
||||||
|
parent: kayobe-seed-images-base
|
||||||
|
nodeset: kayobe-centos8s
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: kayobe-seed-images-rocky8
|
||||||
|
parent: kayobe-seed-images-base
|
||||||
|
nodeset: kayobe-rocky8
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: kayobe-seed-images-ubuntu-focal
|
||||||
|
parent: kayobe-seed-images-base
|
||||||
|
nodeset: kayobe-ubuntu-focal
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kayobe-overcloud-host-configure-base
|
name: kayobe-overcloud-host-configure-base
|
||||||
parent: kayobe-overcloud-base
|
parent: kayobe-overcloud-base
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
- kayobe-seed-centos8s
|
- kayobe-seed-centos8s
|
||||||
- kayobe-seed-rocky8
|
- kayobe-seed-rocky8
|
||||||
- kayobe-seed-ubuntu-focal
|
- kayobe-seed-ubuntu-focal
|
||||||
|
- kayobe-seed-images-centos8s
|
||||||
- kayobe-seed-upgrade-centos8s
|
- kayobe-seed-upgrade-centos8s
|
||||||
- kayobe-seed-upgrade-ubuntu-focal
|
- kayobe-seed-upgrade-ubuntu-focal
|
||||||
- kayobe-seed-vm-centos8s
|
- kayobe-seed-vm-centos8s
|
||||||
@ -57,3 +58,8 @@
|
|||||||
- kayobe-infra-vm-centos8s
|
- kayobe-infra-vm-centos8s
|
||||||
- kayobe-infra-vm-rocky8
|
- kayobe-infra-vm-rocky8
|
||||||
- kayobe-infra-vm-ubuntu-focal
|
- kayobe-infra-vm-ubuntu-focal
|
||||||
|
|
||||||
|
experimental:
|
||||||
|
jobs:
|
||||||
|
- kayobe-seed-images-rocky8
|
||||||
|
- kayobe-seed-images-ubuntu-focal
|
||||||
|
Loading…
Reference in New Issue
Block a user