diff options
| -rw-r--r-- | .zuul.yaml | 29 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ceilometer/post.yaml | 15 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ceilometer/run.yaml | 46 |
3 files changed, 18 insertions, 72 deletions
@@ -1,9 +1,20 @@ - job: - name: grenade-dsvm-ceilometer - parent: legacy-dsvm-base - run: playbooks/legacy/grenade-dsvm-ceilometer/run.yaml - post-run: playbooks/legacy/grenade-dsvm-ceilometer/post.yaml - timeout: 10800 + name: grenade-ceilometer + parent: grenade + required-projects: + - opendev.org/openstack/grenade + - opendev.org/openstack/ceilometer + vars: + grenade_devstack_localrc: + shared: + CEILOMETER_BACKEND: none + devstack_plugins: + ceilometer: https://opendev.org/openstack/ceilometer + devstack_services: + ceilometer-acompute: true + ceilometer-acentral: true + ceilometer-aipmi: true + ceilometer-anotification: true irrelevant-files: &ceilometer-irrelevant-files - ^(test-|)requirements.txt$ - ^setup.cfg$ @@ -11,10 +22,6 @@ - ^.*\.rst$ - ^releasenotes/.*$ - ^ceilometer/tests/.*$ - required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/ceilometer - project: templates: @@ -26,7 +33,7 @@ - openstack-lower-constraints-jobs check: jobs: - - grenade-dsvm-ceilometer + - grenade-ceilometer - telemetry-dsvm-integration: irrelevant-files: *ceilometer-irrelevant-files - telemetry-dsvm-integration-ipv6-only: @@ -34,7 +41,7 @@ gate: queue: telemetry jobs: - - grenade-dsvm-ceilometer + - grenade-ceilometer - telemetry-dsvm-integration: irrelevant-files: *ceilometer-irrelevant-files - telemetry-dsvm-integration-ipv6-only: diff --git a/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-ceilometer/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/grenade-dsvm-ceilometer/run.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml deleted file mode 100644 index 81eed278..00000000 --- a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml +++ /dev/null @@ -1,46 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-ceilometer from old job gate-grenade-dsvm-ceilometer-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 - export PROJECTS="openstack/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export GRENADE_PLUGINRC="enable_grenade_plugin ceilometer https://opendev.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=none" - - 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 }}' |