From 46b5fcad239d540bca44e645a708f4029c9f1718 Mon Sep 17 00:00:00 2001
From: "zhu.boxiang" <zhu.boxiang@99cloud.net>
Date: Fri, 8 Oct 2021 09:58:28 +0800
Subject: [PATCH] Fix: Add pre.yaml in publish job

The default pre.yaml will revoke the sudo. So we install the extra tools
before we revoke the sudo.

Change-Id: Ie4ae0dc8ee90e6ea79f2b463988c32aa4ddaadba
---
 .zuul.yaml                        |  1 +
 playbooks/python-tarball/pre.yaml | 37 +++++++++++++++++++++++++++++++
 playbooks/python-tarball/run.yaml | 33 ---------------------------
 3 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 playbooks/python-tarball/pre.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 05b4550..aacb074 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,6 +47,7 @@
     parent: publish-openstack-python-branch-tarball
     description: |
             Publish the results of the tox-tarball job to tarballs.openstack.org.
+    pre-run: playbooks/python-tarball/pre.yaml
     run: playbooks/python-tarball/run.yaml
     post-run: playbooks/python-tarball/post.yaml
     vars:
diff --git a/playbooks/python-tarball/pre.yaml b/playbooks/python-tarball/pre.yaml
new file mode 100644
index 0000000..688f098
--- /dev/null
+++ b/playbooks/python-tarball/pre.yaml
@@ -0,0 +1,37 @@
+- hosts: all
+  tasks:
+    - name: Install poetry!=1.1.8
+      pip:
+        name: poetry!=1.1.8
+      become: yes
+    - name: Add node repo
+      command: curl --silent --location https://rpm.nodesource.com/setup_12.x | sudo bash -
+      become: yes
+    - name: Install nodejs
+      apt:
+        name: nodejs
+        update_cache: yes
+      become: yes
+    - name: Update nodejs version
+      shell:
+        executable: /bin/bash
+        cmd: |
+          npm install -g n
+          n stable
+      become: yes
+    - name: Add yarn repo
+      shell:
+        executable: /bin/bash
+        cmd: |
+          curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+          echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+      become: yes
+    - name: Install yarn
+      apt:
+        name: yarn
+        update_cache: yes
+      become: yes
+  roles:
+    # We use ensure-pip to make sure the wheel module is installed
+    - ensure-pip
+    - revoke-sudo
diff --git a/playbooks/python-tarball/run.yaml b/playbooks/python-tarball/run.yaml
index d5ec6bc..3f13152 100644
--- a/playbooks/python-tarball/run.yaml
+++ b/playbooks/python-tarball/run.yaml
@@ -1,37 +1,5 @@
 - hosts: all
   tasks:
-    - name: Install poetry!=1.1.8
-      pip:
-        name: poetry!=1.1.8
-      become: yes
-    - name: Add node repo
-      command: curl --silent --location https://rpm.nodesource.com/setup_12.x | sudo bash -
-      become: yes
-    - name: Install nodejs
-      apt:
-        name: nodejs
-        update_cache: yes
-      become: yes
-    - name: Update nodejs version
-      shell:
-        executable: /bin/bash
-        cmd: |
-          npm install -g n
-          n stable
-      become: yes
-    - name: Add yarn repo
-      shell:
-        executable: /bin/bash
-        cmd: |
-          curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-          echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-      become: yes
-    - name: Install yarn
-      apt:
-        name: yarn
-        update_cache: yes
-      become: yes
-
     - name: Build tarball and wheel
       shell:
         executable: /bin/bash
@@ -40,4 +8,3 @@
           make package
       args:
         chdir: "src/{{ zuul.project.canonical_name }}"
-      become: yes
\ No newline at end of file