openstack/openstack-ansible
Code Issues Proposed changes

Merge "Make upgrade jobs get role relevant versions"

Browse Source
This commit is contained in:
Zuul 2020-08-15 03:17:24 +00:00 committed by Gerrit Code Review
commit 3be600185a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/gate-check-commit.sh
View File

@ -213,6 +213,7 @@ if [[ "${ACTION}" == "upgrade" ]]; then
unset ANSIBLE_PACKAGE unset ANSIBLE_PACKAGE
unset UPPER_CONSTRAINTS_FILE unset UPPER_CONSTRAINTS_FILE
unset PIP_OPTS unset PIP_OPTS
unset UPGRADE_TARGET_BRANCH
load_nodepool_pip_opts load_nodepool_pip_opts
@ -221,6 +222,11 @@ if [[ "${ACTION}" == "upgrade" ]]; then
# We need this as in stein we were deploying custom # We need this as in stein we were deploying custom
# /etc/openstack_deploy/env.d/aio_metal.yml for metal installs # /etc/openstack_deploy/env.d/aio_metal.yml for metal installs
export SKIP_CUSTOM_ENVD_CHECK=true export SKIP_CUSTOM_ENVD_CHECK=true
export DROP_ROLE_DIRS=true
# NOTE(noonedeadpunk): This might be moved to zuul.d/playbooks/run.yaml
export ZUUL_SRC_PATH="/home/zuul/src"
# Doing symlinking here, as bootstrap role won't be called
ln -s $ZUUL_SRC_PATH /openstack/src
# To execute the upgrade script we need to provide # To execute the upgrade script we need to provide
# an affirmative response to the warning that the # an affirmative response to the warning that the
# upgrade is irreversable. # upgrade is irreversable.

6
scripts/get-ansible-role-requirements.yml
View File

@ -24,8 +24,8 @@
path: "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}" path: "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}"
state: absent state: absent
when: when:
- item.scm == "git" or item.scm is undefined - ((item.path | default(role_path_default) ~ '/' ~ item.name | default(item.src | basename) ~ '/.git') is not directory) or
- "(item.path | default(role_path_default) ~ '/' ~ item.name | default(item.src | basename) ~ '/.git') is not directory" (lookup('env', 'DROP_ROLE_DIRS') | bool is true)
with_items: "{{ required_roles }}" with_items: "{{ required_roles }}"
- name: Ensure the default roles directory exists - name: Ensure the default roles directory exists
@ -95,7 +95,7 @@
when: when:
- "lookup('env', 'ZUUL_SRC_PATH') != ''" - "lookup('env', 'ZUUL_SRC_PATH') != ''"
- "lookup('env', 'UPGRADE_TARGET_BRANCH') == ''"
- name: Generate a list of user overridden roles - name: Generate a list of user overridden roles
set_fact: set_fact:
user_overridden_roles: "{{ user_roles | json_query('[*].name') }}" user_overridden_roles: "{{ user_roles | json_query('[*].name') }}"