openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Added CentOS-7 queens/train content provider job"

This commit is contained in:
Zuul 2020-10-21 22:37:24 +00:00 committed by Gerrit Code Review
parent 3221325e80 0feb5c3c74
commit 2781d196ad
10 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
playbooks/tripleo-buildcontainers/docker.yaml Normal file
View File

@ -0,0 +1,14 @@
- hosts: all
tasks:
- name: Configure docker proxy
include_role:
name: use-docker-mirror
tasks_from: mirror
- name: Set fact of docker upstream
set_fact:
use_upstream_docker: False
- name: Install docker
include_role:
name: ensure-docker

3
roles/build-containers/tasks/main.yaml
View File

@ -257,7 +257,7 @@
- name: Populate provider registry
when:
- provider_job|default(false)|bool
- job.provider_job|default(false)|bool
block:
- name: Retrieve built images
command: "awk '{ print $1 }' {{ workspace }}/containers-successfully-built.log"
@ -275,6 +275,7 @@
- name: Disable HTTPS and certificates to access registry (buildah)
set_fact:
container_cli_opt: '--tls-verify=false'
when: use_buildah | bool
- name: Retag and push images to provider registry
vars:
image: "{{ item }}"

1
roles/build-containers/tasks/package_setup.yml
View File

@ -4,7 +4,6 @@
name:
- "openstack-kolla"
- "python*-tripleoclient"
- "tripleo-ansible"
- name: set template override
set_fact:

5
roles/build-containers/tasks/pre.yaml
View File

@ -8,6 +8,7 @@
when:
- ansible_distribution|lower != 'redhat'
- ansible_distribution_major_version is version('8', '<')
- buildcontainers_venv | default(true) | bool
block:
- name: Set registry_deploy to true only when needed
set_fact:
@ -43,7 +44,7 @@
section: 'registries.insecure'
option: registries
value:
- "localhost:{{ push_registry_port }}"
- "localhost:{{ push_registry_port | default('5001') }}"
- name: Setup repo web service
become: true
@ -62,7 +63,7 @@
- name: Fetch delorean repos if present
shell: |
set -ex
find /etc/yum.repos.d/ -name delorean\* | xargs -I {} cp {} /var/www/html/
find /etc/yum.repos.d/ -name delorean\* -o -name quickstart-centos\* | xargs -I {} cp {} /var/www/html/
- name: Add http iptables rules from containers
command: iptables -I openstack-INPUT 1 -p tcp --dport 80 -s 172.17.0.0/16 -j ACCEPT

2
roles/build-containers/tasks/provider_push.yaml
View File

@ -5,7 +5,7 @@
{{ cmd }}
with_items:
- "{{ container_cli }} tag {{ image }}:{{ version_hash }} {{ image.replace(push_registry_port|string, '5001') }}:{{ version_hash }}"
- "{{ container_cli }} push {{ container_cli_opt }} {{ image.replace(push_registry_port|string, '5001') }}:{{ version_hash }}"
- "{{ container_cli }} push {% if use_buildah|bool %}{{ container_cli_opt }}{% endif %} {{ image.replace(push_registry_port|string, '5001') }}:{{ version_hash }}"
loop_control:
loop_var: "cmd"
changed_when: true

2
roles/build-containers/tasks/tag.yaml
View File

@ -5,7 +5,7 @@
{{ cmd }}
with_items:
- "{{ container_cli }} tag {{ image }}:{{ version_hash }} {{ image }}:{{ version_hash }}_{{ ansible_architecture }}"
- "{{ container_cli }} push {{ container_cli_opt }} {{ image }}:{{ version_hash }}_{{ ansible_architecture }}"
- "{{ container_cli }} push {% if use_buildah|bool %}{{ container_cli_opt }}{% endif %} {{ image }}:{{ version_hash }}_{{ ansible_architecture }}"
loop_control:
loop_var: "cmd"
changed_when: true

10
roles/build-containers/templates/build.sh.j2
View File

@ -2,15 +2,17 @@
{% if buildcontainers_venv is defined and buildcontainers_venv %}
source {{ workspace }}/venv_build/bin/activate
pip install -U decorator
{% endif %}
TRIPLEO_COMMON_PATH="{{ openstack_git_root }}/{% if zuul_internal is defined %}openstack-{% endif %}tripleo-common"
{% else %}
TRIPLEO_COMMON_PATH="/usr/share/openstack-tripleo-common"
{% endif %}
TRIPLEO_CI_PATH="{{ ansible_user_dir }}/src/opendev.org/openstack/tripleo-ci"
### list containers to build
{% if use_kolla | default(true) %}
openstack overcloud container image build {{ container_config }}\
--kolla-config-file {{ workspace }}/kolla-build.conf \
{% if ci_branch != 'rocky' and ci_branch in exclude_containers %}
{% if ci_branch not in ['queens', 'rocky'] and ci_branch in exclude_containers %}
{% for item in exclude_containers[ci_branch] %}
--exclude {{ item }} \
{% endfor %}
@ -23,7 +25,7 @@ egrep "^- " containers-to-build-full.log | awk '{ print $2 }' > containers-expec
### build
openstack overcloud container image build {{ container_config }}\
{% if ci_branch != 'rocky' and ci_branch in exclude_containers %}
{% if ci_branch not in ['queens', 'rocky'] and ci_branch in exclude_containers %}
{% for item in exclude_containers[ci_branch] %}
--exclude {{ item }} \
{% endfor %}
@ -118,7 +120,7 @@ RETCODE=$?
sudo {{ container_cli }} images | grep {{ registry_namespace }}/{{ kolla_base }}-binary > containers-successfully-built.log
### grep errors in all build logs
egrep "^Error:|No match" /tmp/kolla-*/docker -R > containers-build-errors.log 2>&1
egrep "^Error:|No match" /tmp/container-*/docker -R >> containers-build-errors.log 2>&1
egrep "^Error:|No match" /tmp/container-builds/*/docker -R >> containers-build-errors.log 2>&1
### not built (failed)
for i in `cat containers-expected-to-build.log`; do
grep "$i" containers-successfully-built.log || echo "$i" >> containers-failed-to-build.log

2
toci-quickstart/config/collect-logs.yml
View File

@ -35,6 +35,8 @@ artcl_collect_list:
- /home/{{ undercloud_user }}/deploy-overcloudrc
- /home/{{ undercloud_user }}/network-environment.yaml
- /home/{{ undercloud_user }}/workspace/ovb/*.y*ml
- /home/{{ undercloud_user }}/workspace/*.log
- /home/{{ undercloud_user }}/workspace/*.sh
- /home/{{ undercloud_user }}/skip_file
- /home/{{ undercloud_user }}/*.subunit
- /home/{{ undercloud_user }}/tempest/

10
zuul.d/multinode-jobs.yaml
View File

@ -448,6 +448,8 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-7-content-provider-train
- tripleo-ci-centos-7-content-provider-queens
- tripleo-ci-centos-8-containers-multinode-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -461,6 +463,14 @@
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-containers-multinode-train:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider-train
- tripleo-ci-centos-7-containers-multinode-queens:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider-queens
gate:
jobs:
- tripleo-ci-centos-8-containers-multinode-ussuri:

37
zuul.d/undercloud-jobs.yaml
View File

@ -179,3 +179,40 @@
validate_services: false
extra_tags:
- undercloud-upgrade
- job:
name: tripleo-ci-centos-7-content-provider
parent: tripleo-ci-base-singlenode
branches: master
run:
- playbooks/tripleo-buildcontainers/docker.yaml
- playbooks/tripleo-ci/run-v3.yaml
- playbooks/tripleo-ci/run-provider.yml
voting: true
vars:
featureset: '027'
provider_job: true
ib_create_web_repo: true
playbooks:
- quickstart.yml
- multinode-standalone-pre.yml
tags:
- undercloud
- build
- job:
name: tripleo-ci-centos-7-content-provider-queens
parent: tripleo-ci-centos-7-content-provider
branches: master
override-checkout: stable/queens
vars:
branch_override: stable/queens
- job:
name: tripleo-ci-centos-7-content-provider-train
parent: tripleo-ci-centos-7-content-provider
branches: master
override-checkout: stable/train
vars:
branch_override: stable/train
use_buildah: true