diff --git a/playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/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/tempest-dsvm-monasca-java-mysql-full/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/run.yaml
deleted file mode 100644
index a68ddce3..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-java-mysql-full from old job
-    gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv
-  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 monasca-api git://git.openstack.org/openstack/monasca-api
-          MONASCA_API_IMPLEMENTATION_LANG=java
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG=java
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export ENABLED_SERVICES=tempest
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=0
-
-          if [ mysql == "postgresql" ]; then
-              export DEVSTACK_GATE_POSTGRES=1
-          else
-              export DEVSTACK_GATE_POSTGRES=0
-          fi
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-
-          function pre_test_hook {
-              source $BASE/new/monasca-api/devstack/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-api installation
-              source $BASE/new/monasca-api/devstack/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 }}'
diff --git a/playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/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/tempest-dsvm-monasca-java-postgresql-full/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/run.yaml
deleted file mode 100644
index e6679c89..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-java-postgresql-full from old
-    job gate-tempest-dsvm-monasca-java-postgresql-full-ubuntu-xenial-nv
-  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 monasca-api git://git.openstack.org/openstack/monasca-api
-          MONASCA_API_IMPLEMENTATION_LANG=java
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG=java
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export ENABLED_SERVICES=tempest
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=0
-
-          if [ postgresql == "postgresql" ]; then
-              export DEVSTACK_GATE_POSTGRES=1
-          else
-              export DEVSTACK_GATE_POSTGRES=0
-          fi
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-
-          function pre_test_hook {
-              source $BASE/new/monasca-api/devstack/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-api installation
-              source $BASE/new/monasca-api/devstack/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 }}'
diff --git a/playbooks/legacy/tempest-dsvm-monasca-log-api/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-log-api/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-log-api/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/tempest-dsvm-monasca-log-api/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-log-api/run.yaml
deleted file mode 100644
index ea5516dd..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-log-api/run.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-log-api from old job gate-tempest-dsvm-monasca-log-api-ubuntu-xenial-nv
-  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 monasca-api git://git.openstack.org/openstack/monasca-api
-          enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api
-
-          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_NEUTRON=0
-          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,dstat
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-log-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-          export PROJECTS="openstack/monasca-kibana-plugin $PROJECTS"
-
-          function pre_test_hook {
-              source $BASE/new/monasca-log-api/devstack/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-log-api installation
-              source $BASE/new/monasca-log-api/devstack/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 }}'
diff --git a/playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/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/tempest-dsvm-monasca-pipeline-logs/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/run.yaml
deleted file mode 100644
index f520114f..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-pipeline-logs from old job gate-tempest-dsvm-monasca-pipeline-logs-ubuntu-xenial-nv
-  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_NEUTRON=0
-          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,dstat
-
-          devstack_plugin=''
-          if [ logs == 'logs' ]; then
-            devstack_plugin='log-api'
-            export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api"
-          elif [ logs == 'events' ]; then
-            devstack_plugin='events-api'
-            export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-events-api git://git.openstack.org/openstack/monasca-events-api"
-          else
-            echo "Unknown pipeline logs"
-            exit 1
-          fi
-
-          pre_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/pre_test_hook.sh
-          post_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/post_test_hook.sh
-          devstack_rc_script=/opt/stack/new/monasca-$devstack_plugin/devstack/devstackgaterc
-
-          if [ -f $pre_test_hook_script ]; then
-              function pre_test_hook {
-                  source $pre_test_hook_script
-              }
-              export -f pre_test_hook
-          fi
-
-          if [ -f $post_test_hook_script ]; then
-              function post_test_hook {
-                  source $post_test_hook_script
-              }
-              export -f post_test_hook
-          fi
-
-          if [ -f $devstack_rc_script ]; then
-              export DEVSTACK_GATE_SETTINGS=$devstack_rc_script
-          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 }}'
diff --git a/playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/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/tempest-dsvm-monasca-python-mysql-full/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/run.yaml
deleted file mode 100644
index b4371e60..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-python-mysql-full from old job
-    gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv
-  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 monasca-api git://git.openstack.org/openstack/monasca-api
-          MONASCA_API_IMPLEMENTATION_LANG=python
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG=python
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export ENABLED_SERVICES=tempest
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=0
-
-          if [ mysql == "postgresql" ]; then
-              export DEVSTACK_GATE_POSTGRES=1
-          else
-              export DEVSTACK_GATE_POSTGRES=0
-          fi
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-
-          function pre_test_hook {
-              source $BASE/new/monasca-api/devstack/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-api installation
-              source $BASE/new/monasca-api/devstack/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 }}'
diff --git a/playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/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/tempest-dsvm-monasca-python-postgresql-full/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/run.yaml
deleted file mode 100644
index 49b55346..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-python-postgresql-full from
-    old job gate-tempest-dsvm-monasca-python-postgresql-full-ubuntu-xenial-nv
-  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 monasca-api git://git.openstack.org/openstack/monasca-api
-          MONASCA_API_IMPLEMENTATION_LANG=python
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG=python
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export ENABLED_SERVICES=tempest
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=0
-
-          if [ postgresql == "postgresql" ]; then
-              export DEVSTACK_GATE_POSTGRES=1
-          else
-              export DEVSTACK_GATE_POSTGRES=0
-          fi
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-
-          function pre_test_hook {
-              source $BASE/new/monasca-api/devstack/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-api installation
-              source $BASE/new/monasca-api/devstack/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 }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 90fe3a92..35f7298e 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -9418,68 +9418,6 @@
       - openstack/nova-lxd
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-monasca-java-mysql-full
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-java-mysql-full/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/monasca-agent
-      - openstack/monasca-api
-      - openstack/monasca-common
-      - openstack/monasca-grafana-datasource
-      - openstack/monasca-notification
-      - openstack/monasca-persister
-      - openstack/monasca-statsd
-      - openstack/monasca-thresh
-      - openstack/monasca-ui
-      - openstack/python-monascaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-tempest-dsvm-monasca-java-postgresql-full
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-java-postgresql-full/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/monasca-agent
-      - openstack/monasca-api
-      - openstack/monasca-common
-      - openstack/monasca-grafana-datasource
-      - openstack/monasca-notification
-      - openstack/monasca-persister
-      - openstack/monasca-statsd
-      - openstack/monasca-thresh
-      - openstack/monasca-ui
-      - openstack/python-monascaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-tempest-dsvm-monasca-log-api
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-log-api/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-log-api/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/monasca-agent
-      - openstack/monasca-api
-      - openstack/monasca-common
-      - openstack/monasca-grafana-datasource
-      - openstack/monasca-kibana-plugin
-      - openstack/monasca-log-api
-      - openstack/monasca-notification
-      - openstack/monasca-persister
-      - openstack/monasca-statsd
-      - openstack/monasca-thresh
-      - openstack/monasca-ui
-      - openstack/python-monascaclient
-      - openstack/tempest
-
 - job:
     name: legacy-tempest-dsvm-monasca-pipeline-events
     parent: legacy-dsvm-base
@@ -9490,56 +9428,6 @@
       - openstack-infra/devstack-gate
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-monasca-pipeline-logs
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-pipeline-logs/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/tempest
-
-- job:
-    name: legacy-tempest-dsvm-monasca-python-mysql-full
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-python-mysql-full/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/monasca-agent
-      - openstack/monasca-api
-      - openstack/monasca-common
-      - openstack/monasca-grafana-datasource
-      - openstack/monasca-notification
-      - openstack/monasca-persister
-      - openstack/monasca-statsd
-      - openstack/monasca-thresh
-      - openstack/monasca-ui
-      - openstack/python-monascaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-tempest-dsvm-monasca-python-postgresql-full
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/run
-    post-run: playbooks/legacy/tempest-dsvm-monasca-python-postgresql-full/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/monasca-agent
-      - openstack/monasca-api
-      - openstack/monasca-common
-      - openstack/monasca-grafana-datasource
-      - openstack/monasca-notification
-      - openstack/monasca-persister
-      - openstack/monasca-statsd
-      - openstack/monasca-thresh
-      - openstack/monasca-ui
-      - openstack/python-monascaclient
-      - openstack/tempest
-
 - job:
     name: legacy-tempest-dsvm-monasca-transform-python-functional
     parent: legacy-dsvm-base