From 7e4ed593d649ad792a4a947064cf95b6ae9bd274 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 26 May 2020 16:31:19 +0200
Subject: [PATCH] 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 100c950bc7838d691841f8d0f2801eef9579ba5e)
---
 .zuul.yaml                         | 10 ++++++++++
 playbooks/packstack-multinode.yaml | 27 ++++++++++++++++++---------
 run_tests.sh                       |  2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 188955f10..a69489648 100644
--- a/.zuul.yaml
+++ b/.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
diff --git a/playbooks/packstack-multinode.yaml b/playbooks/packstack-multinode.yaml
index 6b8c383bb..2384a4bcd 100644
--- a/playbooks/packstack-multinode.yaml
+++ b/playbooks/packstack-multinode.yaml
@@ -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: |
diff --git a/run_tests.sh b/run_tests.sh
index 4f2eeda14..2f6e52f20 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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