diff --git a/.zuul.yaml b/.zuul.yaml index a59fa002f0..6e342ceb81 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,17 +18,6 @@ - openstack-infra/devstack-gate - openstack/ceilometer -- job: - name: ceilometer-dsvm-tempest-plugin-es - parent: legacy-dsvm-base - run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/run - post-run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ceilometer - - openstack/tempest - - job: name: ceilometer-dsvm-tempest-plugin-mongodb parent: legacy-dsvm-base @@ -160,6 +149,3 @@ - ^setup.cfg$ - telemetry-dsvm-integration-ceilometer - ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only - experimental: - jobs: - - ceilometer-dsvm-tempest-plugin-es diff --git a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/post.yaml b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/post.yaml deleted file mode 100644 index dac875340a..0000000000 --- a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/post.yaml +++ /dev/null @@ -1,80 +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=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/ceilometer-dsvm-tempest-plugin-es/run.yaml b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/run.yaml deleted file mode 100644 index af2b6c3d59..0000000000 --- a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-es/run.yaml +++ /dev/null @@ -1,50 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ceilometer-dsvm-tempest-plugin-es from old job gate-ceilometer-dsvm-tempest-plugin-es-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_CEILOMETER_BACKEND=es - export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "es" = "postgresql" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - if [ "" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - 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 }}'