Fix CI jobs
- Add jobs removed in [1] to the local configuration.
- Fix SSH key distribution in multinode job. It was broken on a
recent Zuul update, it seems.
- Use pip by default instead of pip3 if present (needed for CentOS 7).
[1] - https://review.opendev.org/730813
Change-Id: I2572d92cbaabc1f02fc0790896ccaa3edfc5e6c2
(cherry picked from commit 76b1559d3a161b0d2326ada77bc69d089639075f)
(cherry picked from commit 100c950bc7
)
This commit is contained in:
parent
00bcd23a27
commit
7e4ed593d6
10
.zuul.yaml
10
.zuul.yaml
|
@ -164,6 +164,11 @@
|
|||
- project:
|
||||
check:
|
||||
jobs:
|
||||
- openstack-tox-pep8
|
||||
- openstack-tox-py27
|
||||
- build-openstack-releasenotes:
|
||||
vars:
|
||||
sphinx_python: python3
|
||||
- packstack-integration-scenario001-tempest
|
||||
- packstack-integration-scenario002-tempest
|
||||
- packstack-integration-scenario003-tempest
|
||||
|
@ -172,6 +177,11 @@
|
|||
voting: false
|
||||
gate:
|
||||
jobs:
|
||||
- openstack-tox-pep8
|
||||
- openstack-tox-py27
|
||||
- build-openstack-releasenotes:
|
||||
vars:
|
||||
sphinx_python: python3
|
||||
- packstack-integration-scenario001-tempest
|
||||
- packstack-integration-scenario002-tempest
|
||||
- packstack-integration-scenario003-tempest
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
become: true
|
||||
|
||||
- hosts: controller
|
||||
name: packstack-multinode
|
||||
name: packstack-ssh-preparation-1
|
||||
tasks:
|
||||
- name: Generate SSH key on controller
|
||||
shell: ssh-keygen -t rsa -f /root/.ssh/id_rsa -P ""
|
||||
|
@ -32,14 +32,6 @@
|
|||
become: true
|
||||
register: ssh_key
|
||||
|
||||
- name: Deploy SSH key on compute node
|
||||
authorized_key:
|
||||
user: root
|
||||
state: present
|
||||
key: "{{ ssh_key.stdout }}"
|
||||
delegate_to: "{{ hostvars['compute'].ansible_host }}"
|
||||
become: true
|
||||
|
||||
- name: Deploy SSH key on controller
|
||||
authorized_key:
|
||||
user: root
|
||||
|
@ -47,6 +39,23 @@
|
|||
key: "{{ ssh_key.stdout }}"
|
||||
become: true
|
||||
|
||||
- name: Set SSH key fact to be used by the compute node
|
||||
set_fact:
|
||||
sshkey: "{{ ssh_key.stdout }}"
|
||||
|
||||
- hosts: compute
|
||||
name: packstack-ssh-preparation-2
|
||||
tasks:
|
||||
- name: Deploy SSH key on compute node
|
||||
authorized_key:
|
||||
user: root
|
||||
state: present
|
||||
key: "{{ hostvars['controller'].sshkey }}"
|
||||
become: true
|
||||
|
||||
- hosts: controller
|
||||
name: packstack-multinode
|
||||
tasks:
|
||||
- name: Run Packstack
|
||||
shell:
|
||||
cmd: |
|
||||
|
|
|
@ -183,7 +183,7 @@ else
|
|||
fi
|
||||
|
||||
# Don't assume pip is installed
|
||||
which pip3 && PIP=pip3
|
||||
which pip && PIP=pip
|
||||
if [ -z $PIP ]; then
|
||||
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
|
||||
$SUDO $PKG_MGR -y install python3-pip
|
||||
|
|
Loading…
Reference in New Issue