Merge "Retire ceilometerclient"

playbooks/legacy/ceilometerclient-dsvm-functional-identity-v3-only/post.yaml

@@ -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

playbooks/legacy/ceilometerclient-dsvm-functional-identity-v3-only/run.yaml

@@ -1,54 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-ceilometerclient-dsvm-functional-identity-v3-only
-    from old job gate-ceilometerclient-dsvm-functional-identity-v3-only-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 BRANCH_OVERRIDE=default
-          export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "-identity-v3-only" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              # Configure and run functional tests
-              $BASE/new/python-ceilometerclient/ceilometerclient/tests/functional/hooks/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 }}'

playbooks/legacy/ceilometerclient-dsvm-functional/post.yaml

@@ -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

playbooks/legacy/ceilometerclient-dsvm-functional/run.yaml

@@ -1,53 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-ceilometerclient-dsvm-functional from old job gate-ceilometerclient-dsvm-functional-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 BRANCH_OVERRIDE=default
-          export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              # Configure and run functional tests
-              $BASE/new/python-ceilometerclient/ceilometerclient/tests/functional/hooks/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 }}'

playbooks/legacy/pbr-installation-dsvm-upstream/run.yaml

@@ -92,7 +92,6 @@
           export PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
           export PROJECTS="openstack/oslo.vmware $PROJECTS"
           export PROJECTS="openstack/pycadf $PROJECTS"
-          export PROJECTS="openstack/python-ceilometerclient $PROJECTS"
           export PROJECTS="openstack/python-cinderclient $PROJECTS"
           export PROJECTS="openstack/python-glanceclient $PROJECTS"
           export PROJECTS="openstack/python-heatclient $PROJECTS"

playbooks/legacy/pbr-installation-dsvm/run.yaml

@@ -92,7 +92,6 @@
           export PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
           export PROJECTS="openstack/oslo.vmware $PROJECTS"
           export PROJECTS="openstack/pycadf $PROJECTS"
-          export PROJECTS="openstack/python-ceilometerclient $PROJECTS"
           export PROJECTS="openstack/python-cinderclient $PROJECTS"
           export PROJECTS="openstack/python-glanceclient $PROJECTS"
           export PROJECTS="openstack/python-heatclient $PROJECTS"

playbooks/legacy/requirements-integration-dsvm-ubuntu-trusty/run.yaml

@@ -93,7 +93,6 @@
           export PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
           export PROJECTS="openstack/oslo.vmware $PROJECTS"
           export PROJECTS="openstack/pycadf $PROJECTS"
-          export PROJECTS="openstack/python-ceilometerclient $PROJECTS"
           export PROJECTS="openstack/python-cinderclient $PROJECTS"
           export PROJECTS="openstack/python-glanceclient $PROJECTS"
           export PROJECTS="openstack/python-heatclient $PROJECTS"

playbooks/legacy/requirements-integration-dsvm/run.yaml

@@ -92,7 +92,6 @@
           export PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
           export PROJECTS="openstack/oslo.vmware $PROJECTS"
           export PROJECTS="openstack/pycadf $PROJECTS"
-          export PROJECTS="openstack/python-ceilometerclient $PROJECTS"
           export PROJECTS="openstack/python-cinderclient $PROJECTS"
           export PROJECTS="openstack/python-glanceclient $PROJECTS"
           export PROJECTS="openstack/python-heatclient $PROJECTS"

playbooks/legacy/telemetry-dsvm-integration-python-ceilometerclient/post.yaml

@@ -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

playbooks/legacy/telemetry-dsvm-integration-python-ceilometerclient/run.yaml

@@ -1,88 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-telemetry-dsvm-integration-python-ceilometerclient
-    from old job gate-telemetry-dsvm-integration-python-ceilometerclient-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_HEAT=1
-          export DEVSTACK_GATE_NEUTRON=1
-          if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then
-              export DEVSTACK_GATE_TEMPEST=0
-          else
-              export DEVSTACK_GATE_TEMPEST=1
-          fi
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-
-          export PROJECTS="openstack/ceilometer openstack/aodh"
-
-          # NOTE(sileht): This job runs on Aodh and Ceilometer.
-          # Gnocchi uses an independent release cycle. So we map here
-          # which Gnocchi version can be used with other OpenStack
-          # components and the reverse.
-          case "$ZUUL_BRANCH" in
-              "stable/newton")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                  export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.0"
-                  export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
-                  ;;
-              "stable/ocata")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                  export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1"
-                  export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
-                  ;;
-              *)
-                export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                export PROJECTS="openstack/panko $PROJECTS"
-                ;;
-          esac
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
-
-          export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
-
-          function post_test_hook {
-              cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/
-              ./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 }}'

zuul.d/zuul-legacy-jobs.yaml

@@ -351,30 +351,6 @@
       - openstack/cinder
       - openstack/python-brick-cinderclient-ext
 
-- job:
-    name: legacy-ceilometerclient-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/ceilometerclient-dsvm-functional/run.yaml
-    post-run: playbooks/legacy/ceilometerclient-dsvm-functional/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/python-ceilometerclient
-
-- job:
-    name: legacy-ceilometerclient-dsvm-functional-identity-v3-only
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/ceilometerclient-dsvm-functional-identity-v3-only/run.yaml
-    post-run: playbooks/legacy/ceilometerclient-dsvm-functional-identity-v3-only/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/python-ceilometerclient
-
 - job:
     name: legacy-cinder-tox-bandit-baseline
     parent: legacy-base
@@ -3201,7 +3177,6 @@
       - openstack/oslo.versionedobjects
       - openstack/oslo.vmware
       - openstack/pycadf
-      - openstack/python-ceilometerclient
       - openstack/python-cinderclient
       - openstack/python-glanceclient
       - openstack/python-heatclient
@@ -3299,7 +3274,6 @@
       - openstack/oslo.versionedobjects
       - openstack/oslo.vmware
       - openstack/pycadf
-      - openstack/python-ceilometerclient
       - openstack/python-cinderclient
       - openstack/python-glanceclient
       - openstack/python-heatclient
@@ -5020,7 +4994,6 @@
       - openstack/oslo.versionedobjects
       - openstack/oslo.vmware
       - openstack/pycadf
-      - openstack/python-ceilometerclient
       - openstack/python-cinderclient
       - openstack/python-glanceclient
       - openstack/python-heatclient
@@ -5119,7 +5092,6 @@
       - openstack/oslo.versionedobjects
       - openstack/oslo.vmware
       - openstack/pycadf
-      - openstack/python-ceilometerclient
       - openstack/python-cinderclient
       - openstack/python-glanceclient
       - openstack/python-heatclient
@@ -5603,23 +5575,6 @@
     run: playbooks/legacy/system-config-puppet-syntax-3/run.yaml
     timeout: 1800
 
-- job:
-    name: legacy-telemetry-dsvm-integration-python-ceilometerclient
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/telemetry-dsvm-integration-python-ceilometerclient/run.yaml
-    post-run: playbooks/legacy/telemetry-dsvm-integration-python-ceilometerclient/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/panko
-      - openstack/python-ceilometerclient
-      # following are required when DEVSTACK_GATE_HEAT, which this
-      # job turns on
-      - openstack/dib-utils
-      - openstack/diskimage-builder
-
 - job:
     name: legacy-tempest-almanach-dsvm
     parent: legacy-dsvm-base