From 0613bb3497f5f36f5dbbdd56c32cb0e93e522395 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 5 Sep 2018 19:37:58 +0200 Subject: [PATCH] Import legacy-cloudkitty-dsvm-install Import job legacy-cloudkitty-dsvm-install and rename it. Change-Id: I794463a056d76d384b754f6320e10fa6f85a2e0e --- .zuul.yaml | 16 ++++++- playbooks/cloudkitty-install/post.yaml | 15 +++++++ playbooks/cloudkitty-install/run.yaml | 58 ++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 playbooks/cloudkitty-install/post.yaml create mode 100644 playbooks/cloudkitty-install/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 66a6f3dd..422f3064 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,6 +10,18 @@ - openstack/cloudkitty-tempest-plugin - openstack/python-cloudkittyclient +- job: + name: cloudkitty-install + parent: legacy-dsvm-base + run: playbooks/cloudkitty-install/run.yaml + post-run: playbooks//cloudkitty-install/post.yaml + timeout: 7200 + required-projects: + - openstack-infra/devstack-gate + - openstack/cloudkitty + - openstack/cloudkitty-dashboard + - openstack/python-cloudkittyclient + - project: templates: - openstack-python-jobs @@ -21,11 +33,11 @@ jobs: - cloudkitty-tempest-full: voting: false - - legacy-cloudkitty-dsvm-install + - cloudkitty-install gate: queue: cloudkitty jobs: - - legacy-cloudkitty-dsvm-install + - cloudkitty-install post: jobs: - openstack-tox-cover diff --git a/playbooks/cloudkitty-install/post.yaml b/playbooks/cloudkitty-install/post.yaml new file mode 100644 index 00000000..e07f5510 --- /dev/null +++ b/playbooks/cloudkitty-install/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/cloudkitty-install/run.yaml b/playbooks/cloudkitty-install/run.yaml new file mode 100644 index 00000000..e18bf738 --- /dev/null +++ b/playbooks/cloudkitty-install/run.yaml @@ -0,0 +1,58 @@ +- hosts: all + name: Autoconverted job legacy-cloudkitty-dsvm-install from old job gate-cloudkitty-dsvm-install-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-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/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 ceilometer git://git.openstack.org/openstack/ceilometer + enable_plugin cloudkitty git://git.openstack.org/openstack/cloudkitty master + + EOF + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + + export PROJECTS="openstack/cloudkitty $PROJECTS" + export PROJECTS="openstack/python-cloudkittyclient $PROJECTS" + export PROJECTS="openstack/cloudkitty-dashboard $PROJECTS" + + export BRANCH_OVERRIDE=default + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + 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 }}'