Use buster jobs instead of stretch

As for U we don't support debian stretch, there is no need
in having stretch CI jobs. Buster ones should be used instead.

This also fixes ara report

Needed-by: https://review.opendev.org/706285
Change-Id: I554e512968718492ce6056b29b0612e450f0856b
This commit is contained in:
Dmitriy Rabotyagov 2020-02-15 19:53:24 +02:00
parent 997cf22e1c
commit 18a3067a4f
5 changed files with 26 additions and 16 deletions

View File

@ -173,7 +173,7 @@ function find_files {
! -name '*.html' \
! -name '*.subunit' \
! -name "*.journal" \
! -name 'ansible.sqlite' | grep -v 'stackviz'
! -name 'ansible.sqlite' | egrep -v 'stackviz|ara-report'
}
function rename_files {
@ -203,6 +203,18 @@ store_artifacts /openstack/log/ansible-logging/ "${WORKING_DIR}/logs/ansible"
store_artifacts /openstack/log/ "${WORKING_DIR}/logs/openstack"
store_artifacts /var/log/ "${WORKING_DIR}/logs/host"
# Figure out the correct path for ARA
# As this script is not run through tox, and the tox envs are all
# different names, we need to try and find the right path to execute
# ARA from.
ARA_CMD="$(find ${WORKING_DIR}/.tox -path "*/bin/ara" -type f | head -n 1)"
if [[ "${ARA_CMD}" != "" ]]; then
echo "Generating ARA static html report."
${ARA_CMD} generate html "${WORKING_DIR}/logs/ara-report"
fi
# Store the ara sqlite database in the openstack-ci expected path
store_artifacts "${TESTING_HOME}/.ara/ansible.sqlite" "${WORKING_DIR}/logs/ara-report/"
@ -248,12 +260,6 @@ sudo chown -R $(whoami) "${WORKING_DIR}/logs/"
# files are viewable via a web browser in OpenStack-CI.
rename_files
# Figure out the correct path for ARA
# As this script is not run through tox, and the tox envs are all
# different names, we need to try and find the right path to execute
# ARA from.
ARA_CMD="$(find ${WORKING_DIR}/.tox -path "*/bin/ara" -type f | head -n 1)"
# If we could not find ARA, assume it was not installed
# and skip all the related activities.
if [[ "${ARA_CMD}" != "" ]]; then

View File

@ -40,20 +40,22 @@
ssh_key_file: /root/.ssh/id_rsa
- name: Get root private key
command: cat /root/.ssh/id_rsa
slurp:
src: /root/.ssh/id_rsa
register: private_key_get
changed_when: false
- name: Get root public key
command: cat /root/.ssh/id_rsa.pub
slurp:
src: /root/.ssh/id_rsa.pub
register: public_key_get
changed_when: false
- name: Set key facts
set_fact:
root_public_key: "{{ public_key_get.stdout }}"
root_private_key: "{{ private_key_get.stdout }}"
lxc_container_ssh_key: "{{ public_key_get.stdout }}"
root_public_key: "{{ public_key_get.content | b64decode }}"
root_private_key: "{{ private_key_get.content | b64decode }}"
lxc_container_ssh_key: "{{ public_key_get.content | b64decode }}"
- name: Ensure root can ssh to localhost
authorized_key:

View File

@ -69,6 +69,8 @@ lxc_net_bridge: lxcbr0
lxc_kernel_options:
- { key: 'fs.inotify.max_user_instances', value: 1024 }
lxc_config_key_apparmor: "{{ lookup('pipe', 'lxc-info --version || echo 2.0.0') is version('3.0.0', 'lt') | ternary('aa_profile', 'apparmor.profile') }}"
lxc_container_config_list:
- "{{ (hostvars[physical_host]['ansible_distribution'] == 'Debian' and hostvars[physical_host]['ansible_distribution_major_version'] == '10' ) | ternary('lxc.aa_profile=unconfined', 'lxc.aa_profile=lxc-openstack') }}"
# Galera Settings
galera_address: "{{ test_galera_host }}"

View File

@ -113,9 +113,9 @@
tox_env: upgrade
- job:
name: openstack-ansible-functional-debian-stable
name: openstack-ansible-functional-debian-buster
parent: openstack-ansible-functional
nodeset: debian-stable
nodeset: debian-buster
- job:
name: openstack-ansible-functional-ubuntu-bionic

View File

@ -13,13 +13,13 @@
check:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-debian-stable
- openstack-ansible-functional-debian-buster
- openstack-ansible-functional-centos-7
- openstack-ansible-functional-ubuntu-bionic
gate:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-debian-stable
- openstack-ansible-functional-debian-buster
- openstack-ansible-functional-centos-7
- openstack-ansible-functional-ubuntu-bionic
experimental: