Execute kayobe in verbose mode in CI
Also refactors the CI job playbooks to create the previous git repo clones for upgrade jobs in the kayobe-base job. Change-Id: I10c2b872887a47fab1a373fc0525dcd6fc78f7e2
This commit is contained in:
parent
45b4961de1
commit
691ddeb614
@ -15,3 +15,35 @@
|
|||||||
dest: "/tmp"
|
dest: "/tmp"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
remote_src: true
|
remote_src: true
|
||||||
|
|
||||||
|
- name: Ensure kayobe is executed in verbose mode
|
||||||
|
lineinfile:
|
||||||
|
path: "{{ kayobe_src_dir }}/dev/config.sh"
|
||||||
|
line: "export KAYOBE_EXTRA_ARGS=-vvv"
|
||||||
|
regexp: "^#export KAYOBE_EXTRA_ARGS=$"
|
||||||
|
|
||||||
|
- block:
|
||||||
|
- name: Ensure previous kayobe directory exists
|
||||||
|
file:
|
||||||
|
path: "{{ previous_kayobe_src_dir }}"
|
||||||
|
state: directory
|
||||||
|
|
||||||
|
- name: Ensure previous kayobe repository is cloned
|
||||||
|
command: >-
|
||||||
|
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
|
||||||
|
|
||||||
|
- name: Ensure previous kayobe-config directory exists
|
||||||
|
file:
|
||||||
|
path: "{{ previous_kayobe_config_src_dir }}"
|
||||||
|
state: directory
|
||||||
|
|
||||||
|
- name: Ensure kayobe-config repository is cloned
|
||||||
|
command: >-
|
||||||
|
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
|
||||||
|
|
||||||
|
- name: Ensure previous kayobe is executed in verbose mode
|
||||||
|
lineinfile:
|
||||||
|
path: "{{ previous_kayobe_src_dir }}/dev/config.sh"
|
||||||
|
line: "export KAYOBE_EXTRA_ARGS=-vvv"
|
||||||
|
regexp: "^#export KAYOBE_EXTRA_ARGS=$"
|
||||||
|
when: is_upgrade
|
||||||
|
@ -1,24 +1,6 @@
|
|||||||
---
|
---
|
||||||
- hosts: primary
|
- hosts: primary
|
||||||
tasks:
|
tasks:
|
||||||
- name: Ensure previous kayobe directory exists
|
|
||||||
file:
|
|
||||||
path: "{{ previous_kayobe_src_dir }}"
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Ensure previous kayobe repository is cloned
|
|
||||||
command: >-
|
|
||||||
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
|
|
||||||
|
|
||||||
- name: Ensure previous kayobe-config directory exists
|
|
||||||
file:
|
|
||||||
path: "{{ previous_kayobe_config_src_dir }}"
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Ensure kayobe-config repository is cloned
|
|
||||||
command: >-
|
|
||||||
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
|
|
||||||
|
|
||||||
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
|
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
|
||||||
# precedence over the standard config files.
|
# precedence over the standard config files.
|
||||||
- name: Ensure kayobe-config override config file exists
|
- name: Ensure kayobe-config override config file exists
|
||||||
|
@ -1,24 +1,6 @@
|
|||||||
---
|
---
|
||||||
- hosts: primary
|
- hosts: primary
|
||||||
tasks:
|
tasks:
|
||||||
- name: Ensure previous kayobe directory exists
|
|
||||||
file:
|
|
||||||
path: "{{ previous_kayobe_src_dir }}"
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Ensure previous kayobe repository is cloned
|
|
||||||
command: >-
|
|
||||||
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
|
|
||||||
|
|
||||||
- name: Ensure previous kayobe-config directory exists
|
|
||||||
file:
|
|
||||||
path: "{{ previous_kayobe_config_src_dir }}"
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Ensure kayobe-config repository is cloned
|
|
||||||
command: >-
|
|
||||||
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
|
|
||||||
|
|
||||||
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
|
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
|
||||||
# precedence over the standard config files.
|
# precedence over the standard config files.
|
||||||
- name: Ensure kayobe-config override config file exists
|
- name: Ensure kayobe-config override config file exists
|
||||||
|
@ -84,6 +84,7 @@
|
|||||||
previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
|
previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
|
||||||
requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
|
requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
|
||||||
tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
|
tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
|
||||||
|
is_upgrade: "{{ 'upgrade' in zuul.job }}"
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kayobe-overcloud-base
|
name: kayobe-overcloud-base
|
||||||
|
Loading…
Reference in New Issue
Block a user