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