CI: Always use upper-constraints
In stable branches we are getting hit by more py2-incompats. Let's pin u-c in all CI pip invocations. Change-Id: Ie2bcc7c115cd2aaf4639d90803216011b346daf3
This commit is contained in:

committed by
Marcin Juszkiewicz

parent
5659177026
commit
641b22b2ef
@@ -27,6 +27,7 @@
|
|||||||
dashboard_enabled: "{{ openstack_core_enabled }}"
|
dashboard_enabled: "{{ openstack_core_enabled }}"
|
||||||
# TODO(mgoddard): Remove when previous_release is ussuri.
|
# TODO(mgoddard): Remove when previous_release is ussuri.
|
||||||
playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and not is_centos8 else '3' }}"
|
playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and not is_centos8 else '3' }}"
|
||||||
|
upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
|
||||||
|
|
||||||
- name: Install xfsprogs package for Swift filesystems
|
- name: Install xfsprogs package for Swift filesystems
|
||||||
become: true
|
become: true
|
||||||
@@ -62,6 +63,7 @@
|
|||||||
- name: Ensure tox is installed
|
- name: Ensure tox is installed
|
||||||
pip:
|
pip:
|
||||||
name: tox
|
name: tox
|
||||||
|
extra_args: "-c {{ upper_constraints_file }}"
|
||||||
when: need_build_image
|
when: need_build_image
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
@@ -71,15 +73,24 @@
|
|||||||
file: "{{ zuul.executor.work_root }}/src/opendev.org/openstack/kolla/tests/vars/zuul.yml"
|
file: "{{ zuul.executor.work_root }}/src/opendev.org/openstack/kolla/tests/vars/zuul.yml"
|
||||||
when: need_build_image # only then kolla sources are available (and used)
|
when: need_build_image # only then kolla sources are available (and used)
|
||||||
|
|
||||||
# NOTE(mgoddard): This only affects the remote copy of the repo, not the
|
- block:
|
||||||
# one on the executor.
|
# NOTE(mgoddard): This only affects the remote copy of the repo, not the
|
||||||
- name: checkout the previous kolla-ansible branch
|
# one on the executor.
|
||||||
shell:
|
- name: checkout the previous kolla-ansible branch
|
||||||
cmd: |
|
shell:
|
||||||
git checkout stable/{{ previous_release | lower }}
|
cmd: |
|
||||||
echo "kolla-ansible checked out to:"
|
git checkout stable/{{ previous_release | lower }}
|
||||||
git log --pretty=oneline -1
|
echo "kolla-ansible checked out to:"
|
||||||
chdir: "{{ kolla_ansible_src_dir }}"
|
git log --pretty=oneline -1
|
||||||
|
chdir: "{{ kolla_ansible_src_dir }}"
|
||||||
|
|
||||||
|
- name: checkout the previous requirements branch
|
||||||
|
shell:
|
||||||
|
cmd: |
|
||||||
|
git checkout stable/{{ previous_release | lower }}
|
||||||
|
echo "requirements checked out to:"
|
||||||
|
git log --pretty=oneline -1
|
||||||
|
chdir: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/"
|
||||||
when: is_upgrade
|
when: is_upgrade
|
||||||
|
|
||||||
- name: ensure /etc/kolla exists
|
- name: ensure /etc/kolla exists
|
||||||
@@ -206,6 +217,7 @@
|
|||||||
- "ara<1.0.0"
|
- "ara<1.0.0"
|
||||||
# TODO(mgoddard): Always use pip3 when previous_release is ussuri.
|
# TODO(mgoddard): Always use pip3 when previous_release is ussuri.
|
||||||
executable: "pip{{ playbook_python_version }}"
|
executable: "pip{{ playbook_python_version }}"
|
||||||
|
extra_args: "-c {{ upper_constraints_file }}"
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
# TODO(mgoddard): Always use python3 when previous_release is ussuri.
|
# TODO(mgoddard): Always use python3 when previous_release is ussuri.
|
||||||
@@ -277,7 +289,7 @@
|
|||||||
TAG: "{{ build_image_tag }}"
|
TAG: "{{ build_image_tag }}"
|
||||||
KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/opendev.org/openstack/kolla"
|
KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/opendev.org/openstack/kolla"
|
||||||
SCENARIO: "{{ scenario }}"
|
SCENARIO: "{{ scenario }}"
|
||||||
UPPER_CONSTRAINTS: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
|
UPPER_CONSTRAINTS: "{{ upper_constraints_file }}"
|
||||||
|
|
||||||
- name: Run init-swift.sh script
|
- name: Run init-swift.sh script
|
||||||
script:
|
script:
|
||||||
@@ -468,6 +480,14 @@
|
|||||||
git log --pretty=oneline -1
|
git log --pretty=oneline -1
|
||||||
chdir: "{{ kolla_ansible_src_dir }}"
|
chdir: "{{ kolla_ansible_src_dir }}"
|
||||||
|
|
||||||
|
- name: checkout the current requirements branch
|
||||||
|
shell:
|
||||||
|
cmd: |
|
||||||
|
git checkout {{ zuul.branch }}
|
||||||
|
echo "requirements checked out to:"
|
||||||
|
git log --pretty=oneline -1
|
||||||
|
chdir: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/"
|
||||||
|
|
||||||
# TODO(mnasiadka): Remove in Victoria
|
# TODO(mnasiadka): Remove in Victoria
|
||||||
- name: Remove not needed external ceph required configs
|
- name: Remove not needed external ceph required configs
|
||||||
file:
|
file:
|
||||||
@@ -517,6 +537,7 @@
|
|||||||
- "ansible{{ ansible_version_constraint }}"
|
- "ansible{{ ansible_version_constraint }}"
|
||||||
- "ara<1.0.0"
|
- "ara<1.0.0"
|
||||||
executable: pip3
|
executable: pip3
|
||||||
|
extra_args: "-c {{ upper_constraints_file }}"
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
- name: get ARA callback plugin path
|
- name: get ARA callback plugin path
|
||||||
@@ -534,6 +555,7 @@
|
|||||||
pip:
|
pip:
|
||||||
name: "{{ kolla_ansible_src_dir }}"
|
name: "{{ kolla_ansible_src_dir }}"
|
||||||
executable: pip3
|
executable: pip3
|
||||||
|
extra_args: "-c {{ upper_constraints_file }}"
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
# Update passwords.yml to include any new passwords added in this
|
# Update passwords.yml to include any new passwords added in this
|
||||||
|
Reference in New Issue
Block a user