diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 00000000..5fdf236a
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,51 @@
+- project:
+    name: openstack/freezer
+    check:
+      jobs:
+        - osbackup-freezer-dsvm:
+            voting: false
+        - osbackup-freezer-dsvm-centos-7:
+            voting: false
+        - osbackup-freezer-dsvm-opensuse-423:
+            voting: false
+
+- job:
+    name: osbackup-freezer-dsvm
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/osbackup-freezer-dsvm/run.yaml
+    post-run: playbooks/legacy/osbackup-freezer-dsvm/post.yaml
+    timeout: 7800
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/freezer
+      - openstack/freezer-api
+      - openstack/freezer-web-ui
+      - openstack/python-freezerclient
+
+- job:
+    name: osbackup-freezer-dsvm-centos-7
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yaml
+    post-run: playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yaml
+    timeout: 7800
+    nodeset: legacy-centos-7
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/freezer
+      - openstack/freezer-api
+      - openstack/freezer-web-ui
+      - openstack/python-freezerclient
+
+- job:
+    name: osbackup-freezer-dsvm-opensuse-423
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yaml
+    post-run: playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yaml
+    timeout: 7800
+    nodeset: legacy-opensuse-423
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/freezer
+      - openstack/freezer-api
+      - openstack/freezer-web-ui
+      - openstack/python-freezerclient
diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index e9a5fdb1..9bfa3fc8 100755
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -27,6 +27,8 @@ echo "Start Gate Hook"
 # Swift is needed for some of the integration tests
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service s-proxy s-object s-container s-account"
 
+export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin"
+
 $BASE/new/devstack-gate/devstack-vm-gate.sh
 
 echo "End Gate Hook"
diff --git a/playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yml b/playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yml
new file mode 100644
index 00000000..9156dff2
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yml
@@ -0,0 +1,80 @@
+- 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
\ No newline at end of file
diff --git a/playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yml b/playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yml
new file mode 100644
index 00000000..4e7ce6d5
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yml
@@ -0,0 +1,74 @@
+- hosts: all
+  name: Autoconverted job legacy-osbackup-freezer-dsvm-centos7 from old job gate-osbackup-freezer-dsvm-centos7
+  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 freezer-agent and freezer-scheduler
+          enable_plugin freezer git://git.openstack.org/openstack/freezer
+          # enable freezer-api and python-freezerclient
+          enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
+          # enable freezer-web-ui and python-freezerclient
+          enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          # checkout freezer components
+          export PROJECTS="openstack/freezer-api $PROJECTS"
+          export PROJECTS="openstack/freezer-web-ui $PROJECTS"
+          export PROJECTS="openstack/freezer $PROJECTS"
+          export PROJECTS="openstack/python-freezerclient $PROJECTS"
+          # tempest config
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          TEMPEST_REGEX="freezer_tempest_plugin"
+          export DEVSTACK_GATE_TEMPEST_REGEX=freezer
+
+          # which repo is being tested
+          export DEVSTACK_PROJECT_FROM_GIT=freezer
+
+          export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
+
+          function gate_hook {{
+              source $BASE/new/freezer/devstack/gate_hook.sh
+          }}
+          export -f gate_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/osbackup-freezer-dsvm-opensuse-423/post.yml b/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yml
new file mode 100644
index 00000000..9156dff2
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yml
@@ -0,0 +1,80 @@
+- 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
\ No newline at end of file
diff --git a/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yml b/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yml
new file mode 100644
index 00000000..8323dff5
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yml
@@ -0,0 +1,74 @@
+- hosts: all
+  name: Autoconverted job legacy-osbackup-freezer-dsvm-opensuse-423 from old job gate-osbackup-freezer-dsvm-opensuse-423
+  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 freezer-agent and freezer-scheduler
+          enable_plugin freezer git://git.openstack.org/openstack/freezer
+          # enable freezer-api and python-freezerclient
+          enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
+          # enable freezer-web-ui and python-freezerclient
+          enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          # checkout freezer components
+          export PROJECTS="openstack/freezer-api $PROJECTS"
+          export PROJECTS="openstack/freezer-web-ui $PROJECTS"
+          export PROJECTS="openstack/freezer $PROJECTS"
+          export PROJECTS="openstack/python-freezerclient $PROJECTS"
+          # tempest config
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          TEMPEST_REGEX="freezer_tempest_plugin"
+          export DEVSTACK_GATE_TEMPEST_REGEX=freezer
+
+          # which repo is being tested
+          export DEVSTACK_PROJECT_FROM_GIT=freezer
+
+          export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
+
+          function gate_hook {{
+              source $BASE/new/freezer/devstack/gate_hook.sh
+          }}
+          export -f gate_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/osbackup-freezer-dsvm/post.yml b/playbooks/legacy/osbackup-freezer-dsvm/post.yml
new file mode 100644
index 00000000..9156dff2
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm/post.yml
@@ -0,0 +1,80 @@
+- 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
\ No newline at end of file
diff --git a/playbooks/legacy/osbackup-freezer-dsvm/run.yml b/playbooks/legacy/osbackup-freezer-dsvm/run.yml
new file mode 100644
index 00000000..6f2dc161
--- /dev/null
+++ b/playbooks/legacy/osbackup-freezer-dsvm/run.yml
@@ -0,0 +1,74 @@
+- hosts: all
+  name: Autoconverted job legacy-osbackup-freezer-dsvm from old job gate-osbackup-freezer-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 freezer-agent and freezer-scheduler
+          enable_plugin freezer git://git.openstack.org/openstack/freezer
+          # enable freezer-api and python-freezerclient
+          enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
+          # enable freezer-web-ui and python-freezerclient
+          enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          # checkout freezer components
+          export PROJECTS="openstack/freezer-api $PROJECTS"
+          export PROJECTS="openstack/freezer-web-ui $PROJECTS"
+          export PROJECTS="openstack/freezer $PROJECTS"
+          export PROJECTS="openstack/python-freezerclient $PROJECTS"
+          # tempest config
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          TEMPEST_REGEX="freezer_tempest_plugin"
+          export DEVSTACK_GATE_TEMPEST_REGEX=freezer
+
+          # which repo is being tested
+          export DEVSTACK_PROJECT_FROM_GIT=freezer
+
+          export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
+
+          function gate_hook {{
+              source $BASE/new/freezer/devstack/gate_hook.sh
+          }}
+          export -f gate_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 }}'