diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index 2d4e4d8..2500254 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -1,151 +1,2 @@
-parameters:
-  _param:
-    jenkins_contrail_dpdk_kernel_modules_dkms: "${_param:jenkins_gerrit_url}/contrail/contrail-dpdk-kernel-modules-dkms"
-  jenkins:
-    client:
-      job_template:
-        build-opencontrail-dpdk-extra:
-          name: build-opencontrail-dpdk-extra-{{branch_name}}-{{os}}-{{dist}}
-          jobs:
-            - os: ubuntu
-              dist: trusty
-              branch_name: kilo
-              branch_real_name: kilo
-              aptly_repo: ubuntu-trusty-kilo
-              binary: "all"
-            - os: ubuntu
-              dist: trusty
-              branch_name: liberty
-              branch_real_name: liberty-multiqueue
-              aptly_repo: ubuntu-trusty-liberty
-              binary: "all"
-            - os: ubuntu
-              dist: trusty
-              branch_name: mitaka
-              branch_real_name: mitaka
-              aptly_repo: ubuntu-trusty-mitaka
-              binary: "all"
-            - os: ubuntu
-              dist: xenial
-              branch_name: mitaka
-              branch_real_name: mitaka
-              aptly_repo: ubuntu-xenial-mitaka
-              binary: "all"
-            - os: ubuntu
-              dist: xenial
-              branch_name: newton
-              branch_real_name: newton
-              aptly_repo: ubuntu-xenial-newton
-              binary: "all"
-            - os: ubuntu
-              dist: xenial
-              branch_name: dpdk1702
-              branch_real_name: mitaka_dpdk_17_02
-              aptly_repo: ubuntu-xenial-oc40-dpdk1702
-              binary: "contrail-dpdk-kernel-modules-dkms"
-          template:
-            discard:
-             build:
-               keep_num: 5
-             artifact:
-               keep_num: 5
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: build-extra-dpdk-pipeline.groovy
-            quiet_period: 120
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail/contrail-dpdk-extra-packages.git"
-              SOURCE_BRANCH:
-                type: string
-                default: "{{branch_real_name}}"
-              SOURCE_CREDENTIALS:
-                type: string
-                default: "gerrit"
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              APTLY_REPO:
-                type: string
-                default: "{{os}}-{{dist}}-{{branch_name}}"
-              OS:
-                type: string
-                default: "{{os}}"
-              DIST:
-                type: string
-                default: "{{dist}}"
-              ARCH:
-                type: string
-                default: "amd64"
-              BINARY_PACKAGES:
-                description: "binary packages to create"
-                type: string
-                default: "{{binary}}"
-        build-opencontrail-dpdk-kernel-modules-dkms:
-          name: build-opencontrail-dpdk-kernel-modules-dkms-{{os}}-{{dist}}-{{dpdk}}
-          jobs:
-            - os: ubuntu
-              dist: xenial
-              branch: contrail_dpdk_2_1
-              dpdk: "21"
-              aptly_repo: ubuntu-xenial-mitaka
-            - os: ubuntu
-              dist: xenial
-              dpdk: "1702"
-              branch: contrail_dpdk_17_02
-              aptly_repo: ubuntu-xenial-oc40-dpdk1702
-          template:
-            discard:
-             build:
-               keep_num: 5
-             artifact:
-               keep_num: 5
-            type: workflow-scm
-            concurrent: false
-            quiet_period: 120
-            scm:
-              type: git
-              url: "${_param:jenkins_contrail_dpdk_kernel_modules_dkms}"
-              credentials: "gerrit"
-              branch: "{{branch}}"
-            trigger:
-              gerrit:
-                project:
-                  contrail/contrail-dpdk:
-                    branches:
-                      - "{{branch}}"
-                message:
-                  build_successful: "Build successful"
-                  build_unstable: "Build unstable"
-                  build_failure: "Build failed"
-                event:
-                  ref:
-                    - updated
-            param:
-              SOURCE_BRANCH:
-                type: string
-                default: "{{branch}}"
-              SOURCE_CREDENTIALS:
-                type: string
-                default: "gerrit"
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              APTLY_REPO:
-                type: string
-                default: "{{aptly_repo}}"
-              OS:
-                type: string
-                default: "{{os}}"
-              DIST:
-                type: string
-                default: "{{dist}}"
-              ARCH:
-                type: string
-                default: "amd64"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 0f130c4..2500254 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -1,250 +1,2 @@
-parameters:
-  _param:
-    jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
-  jenkins:
-    client:
-      job_template:
-        build-opencontrail:
-          name: build-opencontrail-{{buildname}}-{{os}}-{{dist}}
-          jobs:
-            - buildname: oc303
-              os: ubuntu
-              dist: trusty
-              branch: R3.0.3.x
-              ppa: mirantis-opencontrail/opencontrail-3.0.3
-              upload_source_package: false
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc31
-              os: ubuntu
-              dist: trusty
-              branch: R3.1
-              ppa: mirantis-opencontrail/opencontrail-3.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc31
-              os: ubuntu
-              dist: xenial
-              branch: R3.1
-              ppa: mirantis-opencontrail/opencontrail-3.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc311
-              os: ubuntu
-              dist: trusty
-              branch: R3.1.1.x
-              ppa: mirantis-opencontrail/opencontrail-3.1.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc311
-              os: ubuntu
-              dist: xenial
-              branch: R3.1.1.x
-              ppa: mirantis-opencontrail/opencontrail-3.1.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc32
-              os: ubuntu
-              dist: trusty
-              branch: R3.2
-              ppa: mirantis-opencontrail/opencontrail-3.2
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: ""
-            - buildname: oc32
-              os: ubuntu
-              dist: xenial
-              branch: R3.2
-              ppa: mirantis-opencontrail/opencontrail-3.2
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: ""
-            - buildname: oc323
-              os: ubuntu
-              dist: trusty
-              branch: R3.2.3.x
-              ppa: mirantis-opencontrail/opencontrail-3.2.3
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc323
-              os: ubuntu
-              dist: xenial
-              branch: R3.2.3.x
-              ppa: mirantis-opencontrail/opencontrail-3.2.3
-              upload_source_package: true
-              dpdk: contrail_dpdk_2_1
-              build_trigger: ""
-            - buildname: oc40
-              os: ubuntu
-              dist: trusty
-              branch: R4.0
-              ppa: mirantis-opencontrail/opencontrail-4.0
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */3 * *"
-            - buildname: oc40
-              os: ubuntu
-              dist: xenial
-              branch: R4.0
-              ppa: mirantis-opencontrail/opencontrail-4.0
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */3 * *"
-            - buildname: oc41
-              os: ubuntu
-              dist: trusty
-              branch: R4.1
-              ppa: mirantis-opencontrail/opencontrail-4.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */7 * *"
-            - buildname: oc41
-              os: ubuntu
-              dist: xenial
-              branch: R4.1
-              ppa: mirantis-opencontrail/opencontrail-4.1
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */7 * *"
-            - buildname: oc50
-              os: ubuntu
-              dist: xenial
-              branch: R5.0
-              ppa: mirantis-opencontrail/opencontrail-5.0
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */7 * *"
-            - buildname: oc666
-              os: ubuntu
-              dist: trusty
-              branch: master
-              ppa: mirantis-opencontrail/opencontrail-master
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */7 * *"
-            - buildname: oc666
-              os: ubuntu
-              dist: xenial
-              branch: master
-              ppa: mirantis-opencontrail/opencontrail-master
-              upload_source_package: true
-              dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) */7 * *"
-          template:
-            discard:
-             build:
-               keep_num: 5
-             artifact:
-               keep_num: 2
-            type: workflow-scm
-            concurrent: true
-            quiet_period: 120
-            scm:
-              type: git
-              url: "${_param:jenkins_contrail_pipeline}"
-              credentials: "gerrit"
-              github:
-                url: https://github.com/Mirantis/ccp-contrail-pipeline
-            param:
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              APTLY_REPO:
-                type: string
-                default: "{{os}}-{{dist}}-{{buildname}}"
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail"
-              SOURCE_BRANCH:
-                type: string
-                default: "{{branch}}"
-              SOURCE_CREDENTIALS:
-                type: string
-                default: "gerrit"
-              KEEP_REPOS:
-                type: boolean
-                default: 'false'
-                description: "Don't cleanup on failure"
-              DPDK_BRANCH:
-                type: string
-                default: "{{dpdk}}"
-              OS:
-                type: string
-                default: "{{os}}"
-              DIST:
-                type: string
-                default: "{{dist}}"
-              ARCH:
-                type: string
-                default: "amd64"
-              PPA:
-                type: string
-                default: "{{ppa}}"
-              UPLOAD_SOURCE_PACKAGE:
-                type: boolean
-                default: '{{upload_source_package}}'
-            trigger:
-              pollscm:
-                spec: "{{build_trigger}}"
-              gerrit:
-                project:
-                   contrail/contrail-pipeline:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-build:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-controller:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-vrouter:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-third-party:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-generateDS:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-sandesh:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-packages:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-nova-vif-driver:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-neutron-plugin:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-nova-extensions:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-heat:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-web-storage:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-web-server-manager:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-web-controller:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-web-core:
-                     branches:
-                       - "{{branch}}"
-                   contrail/contrail-webui-third-party:
-                     branches:
-                       - "{{branch}}"
-                event:
-                  comment:
-                    - addedContains:
-                        commentAddedCommentContains: '(buildpackage)'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/build/init.yml b/jenkins/client/job/opencontrail/build/init.yml
index b4853b6..2500254 100644
--- a/jenkins/client/job/opencontrail/build/init.yml
+++ b/jenkins/client/job/opencontrail/build/init.yml
@@ -1,4 +1,2 @@
-classes:
-  - system.jenkins.client.job.opencontrail.build.generic
-  - system.jenkins.client.job.opencontrail.build.test
-  - system.jenkins.client.job.opencontrail.build.dpdk-extra
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 655b9f8..2500254 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -1,71 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job_template:
-        test-opencontrail:
-          name: test-opencontrail-{{buildname}}-{{os}}-{{dist}}
-          jobs:
-            - buildname: oc31
-              os: ubuntu
-              dist: trusty
-              branch: R3.1
-            - buildname: oc311
-              os: ubuntu
-              dist: trusty
-              branch: R3.1.1.x
-            - buildname: oc32
-              os: ubuntu
-              dist: trusty
-              branch: R3.2
-          template:
-            discard:
-             build:
-               keep_num: 5
-             artifact:
-               keep_num: 5
-            type: workflow-scm
-            concurrent: true
-            quiet_period: 120
-            scm:
-              type: git
-              url: "https://github.com/chnyda/contrail-unittest"
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail"
-              SOURCE_BRANCH:
-                type: string
-                default: "{{branch}}"
-              SOURCE_CREDENTIALS:
-                type: string
-                default: "gerrit"
-              KEEP_REPOS:
-                type: boolean
-                default: 'false'
-                description: "Don't cleanup on failure"
-              OS:
-                type: string
-                default: "{{os}}"
-              DIST:
-                type: string
-                default: "{{dist}}"
-              ARCH:
-                type: string
-                default: "amd64"
-            trigger:
-              gerrit:
-                project:
-                  contrail/contrail-controller:
-                    branches:
-                      - "{{branch}}"
-                  contrail/contrail-vrouter:
-                    branches:
-                      - "{{branch}}"
-                event:
-                 comment:
-                    - addedContains:
-                        commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
-            param:
-              TEST_MODELS:
-                type: string
-                default: "{{clusters}}"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/git-mirrors/2way.yml b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
index 49ae2be..2500254 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/2way.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
@@ -1,44 +1,2 @@
-parameters:
-  _param:
-    jenkins_pollscm_spec: "H/60 * * * *"
-  jenkins:
-    client:
-      job_template:
-        git-mirror-2way:
-          name: git-mirror-2way-{{name}}
-          jobs:
-            - name: contrail-pipeline
-              branches: master
-          template:
-            discard:
-              build:
-                keep_num: 10
-              artifact:
-                keep_num: 10
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: git-mirror-2way-pipeline.groovy
-              github:
-                url: "https://github.com/Mirantis/{{name}}"
-            trigger:
-              github:
-              pollscm:
-                spec: ${_param:jenkins_pollscm_spec}
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail/{{name}}.git"
-              TARGET_URL:
-                type: string
-                default: "git@github.com:Mirantis/{{name}}.git"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              BRANCHES:
-                type: string
-                default: "{{branches}}"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 891c244..2500254 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -1,122 +1,2 @@
-parameters:
-  _param:
-    jenkins_pollscm_spec: "H/60 * * * *"
-  jenkins:
-    client:
-      job_template:
-        git-mirror:
-          name: git-mirror-{{name}}
-          jobs:
-            - name: contrail-build
-              branches: ${_param:contrail_branches}
-            - name: contrail-controller
-              branches: ${_param:contrail_branches}
-            - name: contrail-vrouter
-              branches: ${_param:contrail_branches}
-            - name: contrail-third-party
-              branches: ${_param:contrail_branches}
-            - name: contrail-generateDS
-              branches: ${_param:contrail_branches_generateDS}
-            - name: contrail-sandesh
-              branches: ${_param:contrail_branches}
-            - name: contrail-packages
-              branches: ${_param:contrail_branches}
-            - name: contrail-nova-vif-driver
-              branches: ${_param:contrail_branches}
-            - name: contrail-neutron-plugin
-              branches: ${_param:contrail_branches}
-            - name: contrail-nova-extensions
-              branches: ${_param:contrail_branches}
-            - name: contrail-ceilometer-plugin
-              branches: ${_param:contrail_ceilometer_plugin_branches}
-            - name: contrail-heat
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-storage
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-server-manager
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-controller
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-core
-              branches: ${_param:contrail_branches}
-            - name: contrail-webui-third-party
-              branches: ${_param:contrail_branches}
-            - name: contrail-dpdk-extra-packages
-              branches: ${_param:contrail_dpdk_extra_branches}
-            - name: contrail-kubernetes
-              branches: ${_param:contrail_kubernetes_branches}
-            - name: contrail-dpdk
-              branches: ${_param:contrail_dpdk_branches}
-            - name: contrail-common
-              branches: ${_param:oc5_branches}
-            - name: contrail-analytics
-              branches: ${_param:oc5_branches}
-            - name: contrail-api-client
-              branches: ${_param:oc5_branches}
-          template:
-            discard:
-              build:
-                keep_num: 10
-              artifact:
-                keep_num: 10
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: git-mirror-pipeline.groovy
-              github:
-                url: "https://github.com/Juniper/{{name}}"
-            trigger:
-              github:
-              pollscm:
-                spec: ${_param:jenkins_pollscm_spec}
-            param:
-              SOURCE_URL:
-                type: string
-                default: "https://github.com/Juniper/{{name}}.git"
-              TARGET_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail/{{name}}.git"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              BRANCHES:
-                type: string
-                default: "{{branches}}"
-      job:
-        git-mirror-ifmap-python-client:
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-pipeline.groovy
-            github:
-              url: "https://github.com/tcpcloud/ifmap-python-client"
-          trigger:
-            github:
-            pollscm:
-              spec: ${_param:jenkins_pollscm_spec}
-          param:
-            SOURCE_URL:
-              type: string
-              default: "https://github.com/tcpcloud/ifmap-python-client.git"
-            TARGET_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/contrail/ifmap-python-client.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: "master"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/git-mirrors/init.yml b/jenkins/client/job/opencontrail/git-mirrors/init.yml
index 4a06885..2500254 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/init.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/init.yml
@@ -1,4 +1,2 @@
-classes:
-  - system.jenkins.client.job.opencontrail.git-mirrors.downstream
-  - system.jenkins.client.job.opencontrail.git-mirrors.upstream
-  - system.jenkins.client.job.opencontrail.git-mirrors.2way
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index d36d725..2500254 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -1,215 +1,2 @@
-parameters:
-  _param:
-    jenkins_pollscm_spec: "H/60 * * * *"
-    jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
-  jenkins:
-    client:
-      job_template:
-        git-mirror-upstream:
-          name: git-mirror-upstream-{{name}}
-          jobs:
-            - name: contrail-build
-              branches: ${_param:contrail_branches}
-            - name: contrail-controller
-              branches: ${_param:contrail_branches}
-            - name: contrail-vrouter
-              branches: ${_param:contrail_branches}
-            - name: contrail-third-party
-              branches: ${_param:contrail_branches}
-            - name: contrail-generateDS
-              branches: ${_param:contrail_branches}
-            - name: contrail-sandesh
-              branches: ${_param:contrail_branches}
-            - name: contrail-packages
-              branches: ${_param:contrail_branches}
-            - name: contrail-nova-vif-driver
-              branches: ${_param:contrail_branches}
-            - name: contrail-neutron-plugin
-              branches: ${_param:contrail_branches}
-            - name: contrail-nova-extensions
-              branches: ${_param:contrail_branches}
-            - name: contrail-ceilometer-plugin
-              branches: ${_param:contrail_ceilometer_plugin_branches}
-            - name: contrail-heat
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-storage
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-server-manager
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-controller
-              branches: ${_param:contrail_branches}
-            - name: contrail-web-core
-              branches: ${_param:contrail_branches}
-            - name: contrail-webui-third-party
-              branches: ${_param:contrail_branches}
-            - name: contrail-dpdk-extra-packages
-              branches: ${_param:contrail_dpdk_extra_branches}
-            - name: contrail-dpdk
-              branches: ${_param:contrail_dpdk_branches}
-            - name: contrail-third-party-cache-fixup
-              branches: ${_param:contrail_third_party_cache_fixup_branches}
-            - name: contrail-common
-              branches: ${_param:oc5_branches}
-            - name: contrail-analytics
-              branches: ${_param:oc5_branches}
-            - name: contrail-api-client
-              branches: ${_param:oc5_branches}
-          template:
-            discard:
-              build:
-                keep_num: 10
-              artifact:
-                keep_num: 10
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: git-mirror-pipeline.groovy
-              github:
-                url: "https://github.com/Mirantis/{{name}}"
-            trigger:
-              gerrit:
-                project:
-                  contrail/{{name}}:
-                    branches:
-                      - compare_type: "REG_EXP"
-                        name: ".*"
-                message:
-                  build_successful: "Build successful"
-                  build_unstable: "Build unstable"
-                  build_failure: "Build failed"
-                event:
-                  ref:
-                    - updated
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/contrail/{{name}}.git"
-              TARGET_URL:
-                type: string
-                default: "git@github.com:Mirantis/{{name}}.git"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              BRANCHES:
-                type: string
-                default: "{{branches}}"
-      job:
-        git-mirror-upstream-ifmap-python-client:
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-pipeline.groovy
-            github:
-              url: "https://github.com/tcpcloud/ifmap-python-client"
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/contrail/ifmap-python-client.git"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:Mirantis/ifmap-python-client.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: "master"
-        # XXX: this one ccp- prefixed is kind-of obsolete and should be
-        # removed
-        git-mirror-upstream-ccp-contrail-pipeline:
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-pipeline.groovy
-            github:
-              url: https://github.com/Mirantis/ccp-contrail-pipeline
-          trigger:
-            gerrit:
-              project:
-                contrail/contrail-pipeline:
-                  branches:
-                    - master
-              message:
-                build_successful: "Build successful"
-                build_unstable: "Build unstable"
-                build_failure: "Build failed"
-              event:
-                ref:
-                  - updated
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_contrail_pipeline}"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:Mirantis/ccp-contrail-pipeline.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: master
-        git-mirror-upstream-contrail-pipeline:
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-pipeline.groovy
-            github:
-              url: https://github.com/Mirantis/contrail-pipeline
-          trigger:
-            gerrit:
-              project:
-                contrail/contrail-pipeline:
-                  branches:
-                    - master
-              message:
-                build_successful: "Build successful"
-                build_unstable: "Build unstable"
-                build_failure: "Build failed"
-              event:
-                ref:
-                  - updated
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_contrail_pipeline}"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:Mirantis/contrail-pipeline.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: master
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 2072808..2500254 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -1,44 +1,2 @@
-classes:
-  - system.jenkins.client.job.opencontrail.build
-  - system.jenkins.client.job.opencontrail.git-mirrors
-parameters:
-  _param:
-    contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,R5.0,master"
-    # from OC50 there are new repos without older branches
-    oc5_branches: "R5.0,master"
-    # generateDS does not have 5.0 branch
-    contrail_branches_generateDS: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,master"
-    contrail_kubernetes_branches: "master,release-1.2"
-    contrail_dpdk_extra_branches: "mitaka,mitaka_dpdk_17_02,mitaka_dpdk_17_05,kilo,liberty-multiqueue,newton,ocata"
-    contrail_ceilometer_plugin_branches: "master,R4.0,R4.1"
-    contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
-    contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.0.1,R4.1,contrail_dpdk_17_02,contrail_dpdk_17_05,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
-    contrail_third_party_cache_fixup_branches: "master"
-  jenkins:
-    client:
-      view:
-        Opencontrail:
-          enabled: true
-          type: CategorizedJobsView
-          include_regex: "build-opencontrail-.*"
-          categories:
-            - group_regex: "build-opencontrail-dpdk-extra-.*"
-              naming_rule: "DPDK Extras"
-            - group_regex: "build-opencontrail-oc303-.*"
-              naming_rule: "R3.0.3.x"
-            - group_regex: "build-opencontrail-oc31-.*"
-              naming_rule: "R3.1"
-            - group_regex: "build-opencontrail-oc311-.*"
-              naming_rule: "R3.1.1.x"
-            - group_regex: "build-opencontrail-oc32-.*"
-              naming_rule: "R3.2"
-            - group_regex: "build-opencontrail-oc323-.*"
-              naming_rule: "R3.2.3.x"
-            - group_regex: "build-opencontrail-oc40-.*"
-              naming_rule: "R4.0"
-            - group_regex: "build-opencontrail-oc41-.*"
-              naming_rule: "R4.1"
-            - group_regex: "build-opencontrail-oc50-.*"
-              naming_rule: "R5.0"
-            - group_regex: "build-opencontrail-oc666-.*"
-              naming_rule: "oc-666"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo