diff --git a/playbooks/legacy/blazar-devstack-dsvm/post.yaml b/playbooks/legacy/blazar-devstack-dsvm/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/blazar-devstack-dsvm/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- 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/legacy/blazar-devstack-dsvm/run.yaml b/playbooks/legacy/blazar-devstack-dsvm/run.yaml deleted file mode 100644 index 71ef1e89..00000000 --- a/playbooks/legacy/blazar-devstack-dsvm/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-blazar-devstack-dsvm from old job gate-blazar-devstack-dsvm - 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 blazar git://git.openstack.org/openstack/blazar - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export ENABLED_SERVICES=blazar,blazar-a,blazar-m,tempest - export PROJECTS="openstack/blazar $PROJECTS" - export PROJECTS="openstack/blazar-nova $PROJECTS" - export PROJECTS="openstack/python-blazarclient $PROJECTS" - - # Construct a regex to limiting scope of tempest - r="^(?:tempest\.cli\.simple_read_only\.test_.*reservation.*)" - r="$r|^(?:tempest\.scenario\.test_.*reservation.*)" - export DEVSTACK_GATE_TEMPEST_REGEX="$r" - - function pre_test_hook { - # Install blazar tempest integration - BLAZAR_TEMPEST_DIR=/opt/stack/new/blazar/contrib/tempest - # Copying Tempest test suites - # This will be removed once blazar tempest starts to use TempestPlugin - if [ -e $BLAZAR_TEMPEST_DIR ] ; then - TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} - cp -R $BLAZAR_TEMPEST_DIR/tempest/* $TEMPEST_DIR/tempest - fi - } - export -f pre_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 }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index ec89b54c..f3257568 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -182,19 +182,6 @@ post-run: playbooks/legacy/bindep-fallback-ubuntu-trusty/post.yaml nodeset: legacy-ubuntu-trusty -- job: - name: legacy-blazar-devstack-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/blazar-devstack-dsvm/run.yaml - post-run: playbooks/legacy/blazar-devstack-dsvm/post.yaml - timeout: 4200 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/blazar - - openstack/blazar-nova - - openstack/python-blazarclient - - job: name: legacy-brick-cinderclient-ext-dsvm-functional parent: legacy-dsvm-base