Merge "Import python-barbicanclient-dsvm" into stable/pike

3 files changed, 93 insertions, 4 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 43b89dc..9f67286 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,15 @@
+- job:
+    name: python-barbicanclient-dsvm
+    parent: legacy-dsvm-base
+    run: playbooks/python-barbicanclient-dsvm/run.yaml
+    post-run: playbooks/python-barbicanclient-dsvm/post.yaml
+    timeout: 4200
+    required-projects:
+      - openstack/devstack-gate
+      - openstack/barbican
+      - openstack/barbican-tempest-plugin
+      - openstack/python-barbicanclient
+
 - project:
     templates:
       - openstack-python-jobs
@@ -7,7 +19,5 @@
       - openstackclient-plugin-jobs
     check:
       jobs:
-        - legacy-python-barbicanclient-dsvm
-    gate:
-      jobs:
-        - legacy-python-barbicanclient-dsvm
+        - python-barbicanclient-dsvm:
+            voting: false
diff --git a/playbooks/python-barbicanclient-dsvm/post.yaml b/playbooks/python-barbicanclient-dsvm/post.yaml
new file mode 100644
index 0000000..e07f551
--- /dev/null
+++ b/playbooks/python-barbicanclient-dsvm/post.yaml
@@ -0,0 +1,15 @@
+- hosts: primary
+  tasks:
+
+    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
+      synchronize:
+        src: '{{ ansible_user_dir }}/workspace/'
+        dest: '{{ zuul.executor.log_root }}'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=/logs/**
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
diff --git a/playbooks/python-barbicanclient-dsvm/run.yaml b/playbooks/python-barbicanclient-dsvm/run.yaml
new file mode 100644
index 0000000..d30ce34
--- /dev/null
+++ b/playbooks/python-barbicanclient-dsvm/run.yaml
@@ -0,0 +1,64 @@
+- hosts: all
+  name: Autoconverted job legacy-python-barbicanclient-dsvm from old job gate-python-barbicanclient-dsvm-ubuntu-xenial
+  tasks:
+
+    - name: Ensure legacy workspace directory
+      file:
+        path: '{{ ansible_user_dir }}/workspace'
+        state: directory
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat > clonemap.yaml << EOF
+          clonemap:
+            - name: openstack/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              https://opendev.org \
+              openstack/devstack-gate
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat << 'EOF' >>"/tmp/dg-local.conf"
+          [[local|localrc]]
+          enable_plugin barbican https://opendev.org/openstack/barbican
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          export PYTHONUNBUFFERED=true
+          export OVERRIDE_ENABLED_SERVICES=tempest,rabbit,mysql,key
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
+
+          function gate_hook {
+              $BASE/new/barbican/devstack/gate_hook.sh
+          }
+          export -f gate_hook
+
+          function post_test_hook {
+              cd /opt/stack/new/python-barbicanclient/functionaltests
+              ./post_test_hook.sh
+          }
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'