From 645b3a0ef4f76c45851b621397ece6b7c1990d9b Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 4 Feb 2020 10:11:57 +1100
Subject: [PATCH] Convert devstack-bashate to native job

Retire the legacy job for an equivalent native job.

Note this drops devstack-gate testing; that runs tox without a
basepython so breaks when we move bashate to Python 3.  bashate is
pinned in devstack-gate to 0.5.0, and devstack-gate is considered
deprecated, so it will not update to a non-supported version.  We
don't need to keep linting it.

Change-Id: If2ea649d897293a1129b5e30924080936cfc96de
---
 .zuul.d/jobs.yaml                          |  7 +---
 playbooks/bashate-devstack-master/run.yaml | 13 ++++++++
 playbooks/legacy/bashate-devstack/run.yaml | 37 ----------------------
 3 files changed, 14 insertions(+), 43 deletions(-)
 create mode 100644 playbooks/bashate-devstack-master/run.yaml
 delete mode 100644 playbooks/legacy/bashate-devstack/run.yaml

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 3b3216b..5ff80be 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -11,11 +11,6 @@
 
 - job:
     name: bashate-devstack
-    parent: legacy-base
-    run: playbooks/legacy/bashate-devstack/run.yaml
-    timeout: 3600
+    run: playbooks/bashate-devstack-master/run.yaml
     required-projects:
-      - openstack/requirements
       - openstack/devstack
-      - openstack/devstack-gate
-
diff --git a/playbooks/bashate-devstack-master/run.yaml b/playbooks/bashate-devstack-master/run.yaml
new file mode 100644
index 0000000..3932d87
--- /dev/null
+++ b/playbooks/bashate-devstack-master/run.yaml
@@ -0,0 +1,13 @@
+- hosts: all
+  name: Run bashate against devstack master
+  roles:
+    - bindep
+
+  tasks:
+    - shell: 'tox -e bashate'
+      args:
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack"].src_dir }}'
+      environment:
+        BASHATE_INSTALL_PATH: 'file://{{ ansible_user_dir }}/{{ zuul.project.src_dir }}'
+
diff --git a/playbooks/legacy/bashate-devstack/run.yaml b/playbooks/legacy/bashate-devstack/run.yaml
deleted file mode 100644
index 27c2ee5..0000000
--- a/playbooks/legacy/bashate-devstack/run.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bashate-devstack from old job gate-bashate-devstack
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd $WORKSPACE
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://opendev.org \
-            openstack/bashate \
-            openstack/devstack \
-            openstack/devstack-gate
-
-          export BASHATE_INSTALL_PATH=$WORKSPACE/openstack/bashate
-
-          pushd openstack/devstack
-          tox -e bashate
-          popd
-
-          pushd openstack/devstack-gate
-          tox -e bashate
-          popd
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'