diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 55c7f88..a713427 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,155 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      view:
-        Aptly:
-          enabled: true
-          type: CategorizedJobsView
-          include_regex: "aptly-.*"
-          categories:
-            - group_regex: "aptly-.*-nightly-testing"
-              naming_rule: "Nightly -> Testing"
-            - group_regex: "aptly-.*-testing-stable"
-              naming_rule: "Testing -> Stable"
-      job_template:
-        aptly:
-          name: aptly-{{operation}}-{{dist}}-{{source}}-{{target}}
-          jobs:
-            - operation: promote
-              diff_only: false
-              dist: trusty
-              source: nightly
-              target: testing
-            - operation: promote
-              dist: trusty
-              source: testing
-              target: stable
-            - operation: promote
-              dist: xenial
-              source: nightly
-              target: testing
-            - operation: promote
-              dist: xenial
-              source: testing
-              target: stable
-            - operation: diff
-              diff_only: true
-              dist: trusty
-              source: nightly
-              target: testing
-            - operation: diff
-              diff_only: true
-              dist: trusty
-              source: testing
-              target: stable
-            - operation: diff
-              diff_only: true
-              dist: xenial
-              source: nightly
-              target: testing
-            - operation: diff
-              diff_only: true
-              dist: xenial
-              source: testing
-              target: stable
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: aptly-promote-pipeline.groovy
-            param:
-              SOURCE:
-                type: string
-                default: "{{dist}}/{{source}}"
-              TARGET:
-                type: string
-                default: "{{dist}}/{{target}}"
-              RECREATE:
-                type: boolean
-                default: 'false'
-              DUMP_PUBLISH:
-                type: boolean
-                default: 'true'
-              DIFF_ONLY:
-                type: boolean
-                default: '{{diff_only}}'
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              COMPONENTS:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              PACKAGES:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              STORAGES:
-                type: string
-                default: "${_param:jenkins_aptly_storages}"
-                description: "Comma separated list of storage"
-        aptly-all:
-          name: aptly-{{operation}}-all-{{source}}-{{target}}
-          jobs:
-            - operation: promote
-              diff_only: false
-              source: nightly
-              target: testing
-            - operation: promote
-              diff_only: false
-              source: testing
-              target: stable
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: aptly-promote-pipeline.groovy
-            param:
-              SOURCE:
-                type: string
-                default: "(.*)/{{source}}"
-              TARGET:
-                type: string
-                default: "{0}/{{target}}"
-              RECREATE:
-                type: boolean
-                default: 'false'
-              DUMP_PUBLISH:
-                type: boolean
-                default: 'true'
-              DIFF_ONLY:
-                type: boolean
-                default: '{{diff_only}}'
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              COMPONENTS:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              PACKAGES:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              STORAGES:
-                type: string
-                default: "${_param:jenkins_aptly_storages}"
-                description: "Comma separated list of storage"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index 513df82..a713427 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -1,68 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      view:
-        Gating:
-          enabled: true
-          type: ListView
-          include_regex: "gate-.*"
-      job_template:
-        gate-gerrit-namespace:
-          name: gate-gerrit-{{name}}
-          jobs:
-            - name: mk
-              regex: 'mk\/.*'
-            - name: debian
-              regex: 'debian\/.*'
-            - name: contrail
-              regex: 'contrail\/.*'
-            - name: salt-models
-              regex: 'salt-models\/.*'
-            - name: salt-formulas
-              regex: 'salt-formulas\/.*'
-            - name: oss
-              regex: 'oss\/devops-portal'
-          template:
-            discard:
-              build:
-                keep_num: 150
-              artifact:
-                keep_num: 150
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: gating-pipeline.groovy
-            quiet_period: 60
-            trigger:
-              gerrit:
-                project:
-                  '{{regex}}':
-                    compare_type: REG_EXP
-                    branches:
-                      - master
-                      - compare_type: ANT
-                        name: release/*
-                skip_vote:
-                  - successful
-                  - failed
-                  - unstable
-                  - not_built
-                event:
-                  comment:
-                    - added:
-                        verdictCategory: 'Workflow'
-                        commentAddedTriggerApprovalValue: '+1'
-            param:
-              JOBS_NAMESPACE:
-                type: string
-                default: "{{name}}"
-              SKIP_TEST:
-                type: string
-                default: false
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
index cc69c6b..a713427 100644
--- a/jenkins/client/job/kill_stuck_jobs.yml
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -1,26 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        kill-stuck-jobs:
-          name: kill-stuck-jobs
-          discard:
-            build:
-              keep_num: 3
-            artifact:
-              keep_num: 3
-          type: workflow-scm
-          concurrent: true
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: abort-long-running-jobs.groovy
-          trigger:
-            timer:
-              spec: "H H * * *"
-          param:
-            MAX_DURATION_IN_HOURS:
-              type: string
-              default: "24"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 152e951..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,493 +1,2 @@
-parameters:
-  _param:
-    jenkins_pollscm_spec: "H/60 * * * *"
-    job_description_2way: <br>Syncronizes code projects with GitHub.<br>
-  jenkins:
-    client:
-      job_template:
-        git-mirror-2way-salt-formula:
-          name: git-mirror-2way-salt-formula-{{name}}
-          jobs:
-            - name: aodh
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: apache
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: aptcacher
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: aptly
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: artifactory
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: avinetworks
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: auditd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: backupninja
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: barbican
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: baremetal-simulator
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: billometer
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: bind
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: bird
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cadf
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: calico
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cassandra
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ccp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ceilometer
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ceph
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: chrony
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cinder
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: collectd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: debmirror
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dekapod
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: devops-portal
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: docker
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dogtag
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dovecot
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: elasticsearch
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: etcd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: fluentbit
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: fluentd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: foreman
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: freeipa
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: galera
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gerrit
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: git
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gitlab
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: glance
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: glusterfs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gnocchi
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: grafana
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: graphite
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: haproxy
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heat
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heka
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heketi
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: helm
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: horizon
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: influxdb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: iptables
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ironic
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: isc-dhcp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: java
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: jenkins
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kedb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: keepalived
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: keystone
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kibana
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kubernetes
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: letsencrypt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: libvirt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: linux
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: lldp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: logrotate
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: maas
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: magnum
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: manila
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: memcached
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mirascan
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: midonet
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: monasca
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mongodb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: murano
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mysql
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nagios
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: network
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: neutron
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nfs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nginx
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nodejs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nova
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ntp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: octavia
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: opencontrail
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openldap
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openssh
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openvpn
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openvstorage
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: oslo-templates
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: owncloud
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: panko
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: postfix
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: postgresql
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: powerdns
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: pritunl
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: prometheus
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: python
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rabbitmq
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: reclass
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: redis
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: roundcube
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rsync
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rsyslog
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rundeck
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: runtest
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sahara
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: salt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sensu
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sentry
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: shibboleth
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sphinx
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: spinnaker
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: statsd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: supervisor
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: swift
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: taiga
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: telegraf
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: tinyproxy
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: varnish
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: watchdog
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: xtrabackup
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: zookeeper
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-          template:
-            description: ${_param:job_description_2way}
-            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/salt-formulas/salt-formula-{{name}}"
-            trigger:
-              github:
-              pollscm:
-                spec: ${_param:jenkins_pollscm_spec}
-              gerrit:
-                project:
-                  salt-formulas/{{name}}:
-                    branches:
-                      - master
-                event:
-                  ref:
-                    - updated
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
-              TARGET_URL:
-                type: string
-                default: "git@github.com:salt-formulas/salt-formula-{{name}}.git"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              BRANCHES:
-                type: string
-                default: "{{branches}}"
-              NOTIFICATION_RECIPIENTS:
-                type: string
-                default: "{{notification_recipients}}"
-      job:
-        git-mirror-2way-salt-formulas-scripts:
-          description: ${_param:job_description_2way}
-          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/salt-formulas/salt-formulas-scripts"
-          trigger:
-            github:
-            pollscm:
-              spec: ${_param:jenkins_pollscm_spec}
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-scripts.git"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:salt-formulas/salt-formulas-scripts.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: "master,release/2018.8.1,release/2018.11.0"
-        git-mirror-2way-salt-formulas-cookiecutter:
-          description: ${_param:job_description_2way}
-          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/salt-formulas/salt-formulas-cookiecutter"
-          trigger:
-            github:
-            pollscm:
-              spec: ${_param:jenkins_pollscm_spec}
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/cookiecutter-salt-formula"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:salt-formulas/cookiecutter-salt-formula"
-            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
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/init.yml b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
index 676fe4e..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/init.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
@@ -1,7 +1,2 @@
-classes:
-  - system.jenkins.client.job.salt-formulas.git-mirrors.2way
-parameters:
-  _param:
-    salt_formulas_branches: "master"
-    salt_formulas_extra_branches: "master,debian/xenial,debian/trusty"
-    salt_formulas_notification_recipients: "ci-notifications@mirantis.com"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index 8c8c2e2..a713427 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -1,17 +1,2 @@
-classes:
-  - system.jenkins.client.job.salt-formulas.git-mirrors
-  - system.jenkins.client.job.salt-formulas.tests
-  - system.jenkins.client.job.salt-formulas.release
-parameters:
-  jenkins:
-    client:
-      view:
-        "Salt formulas":
-          enabled: true
-          type: CategorizedJobsView
-          include_regex: "build-debian-salt-formula-.*"
-          categories:
-            - group_regex: ".*-ubuntu-trusty"
-              naming_rule: "Ubuntu Trusty"
-            - group_regex: ".*-ubuntu-xenial"
-              naming_rule: "Ubuntu Xenial"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/release.yml b/jenkins/client/job/salt-formulas/release.yml
index eca83f6..a713427 100644
--- a/jenkins/client/job/salt-formulas/release.yml
+++ b/jenkins/client/job/salt-formulas/release.yml
@@ -1,32 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        release-salt-formulas:
-          type: workflow-scm
-          concurrent: false
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: release-salt-formulas-pipeline.groovy
-            github:
-              url: "https://github.com/salt-formulas/salt-formulas"
-          param:
-            TAG:
-              type: string
-            SOURCE_URL:
-              type: string
-              default: "https://github.com/salt-formulas/salt-formulas.git"
-            GERRIT_BASE:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b5b286d..a713427 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -1,231 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job_template:
-        test-salt-formula:
-          name: test-salt-formula-{{name}}-latest
-          jobs:
-            - name: aodh
-            - name: apache
-            - name: aptcacher
-            - name: aptly
-            - name: artifactory
-            - name: auditd
-            - name: avinetworks
-            - name: backupninja
-            - name: barbican
-            - name: baremetal-simulator
-            - name: billometer
-            - name: bind
-            - name: bird
-            - name: cadf
-            - name: calico
-            - name: cassandra
-            - name: ccp
-            - name: ceilometer
-            - name: ceph
-            - name: chrony
-            - name: cinder
-            - name: collectd
-            - name: designate
-            - name: debmirror
-            - name: dekapod
-            - name: devops-portal
-            - name: docker
-            - name: dogtag
-            - name: dovecot
-            - name: elasticsearch
-            - name: etcd
-            - name: fluentbit
-            - name: fluentd
-            - name: foreman
-            - name: freeipa
-            - name: galera
-            - name: gerrit
-            - name: git
-            - name: gitlab
-            - name: glance
-            - name: glusterfs
-            - name: gnocchi
-            - name: grafana
-            - name: graphite
-            - name: haproxy
-            - name: heat
-            - name: heka
-            - name: heketi
-            - name: helm
-            - name: horizon
-            - name: hubble
-            - name: influxdb
-            - name: iptables
-            - name: ironic
-            - name: isc-dhcp
-            - name: java
-            - name: jenkins
-            - name: kedb
-            - name: keepalived
-            - name: keycloak
-            - name: keystone
-            - name: kibana
-            - name: kubernetes
-            - name: letsencrypt
-            - name: libvirt
-            - name: linux
-            - name: lldp
-            - name: logrotate
-            - name: maas
-            - name: magnum
-            - name: manila
-            - name: memcached
-            - name: midonet
-            - name: mirascan
-            - name: monasca
-            - name: mongodb
-            - name: murano
-            - name: mysql
-            - name: nagios
-            - name: network
-            - name: neutron
-            - name: nfs
-            - name: nginx
-            - name: nodejs
-            - name: nova
-            - name: ntp
-            - name: octavia
-            - name: opencontrail
-            - name: openldap
-            - name: openscap
-            - name: openssh
-            - name: openvpn
-            - name: openvstorage
-            - name: oslo-templates
-            - name: owncloud
-            - name: panko
-            - name: postfix
-            - name: postgresql
-            - name: powerdns
-            - name: pritunl
-            - name: prometheus
-            - name: python
-            - name: rabbitmq
-            - name: reclass
-            - name: redis
-            - name: roundcube
-            - name: rsync
-            - name: rsyslog
-            - name: rundeck
-            - name: runtest
-            - name: sahara
-            - name: salt
-            - name: sensu
-            - name: sentry
-            - name: shibboleth
-            - name: sphinx
-            - name: spinnaker
-            - name: statsd
-            - name: supervisor
-            - name: swift
-            - name: taiga
-            - name: telegraf
-            - name: tinyproxy
-            - name: tftpd-hpa
-            - name: varnish
-            - name: watchdog
-            - name: xtrabackup
-            - name: zookeeper
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: test-salt-formulas-pipeline.groovy
-            trigger:
-              gerrit:
-                project:
-                  salt-formulas/{{name}}:
-                    branches:
-                      - master
-                      - '2018.8.1'
-                event:
-                  comment:
-                    - addedContains:
-                        commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
-            param:
-              SALT_VERSION:
-                type: string
-                default: "2017.7.7"
-                description: "Version of salt for use in test, empty string means latest (default)"
-              SALT_OPTS:
-                type: string
-                default: "--force-color"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              DEFAULT_GIT_URL:
-                type: string
-                description: "Run against alternate system reclass"
-                default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
-              DEFAULT_GIT_REF:
-                type: string
-                default: master
-              CUSTOM_KITCHEN_ENVS:
-                type: text
-              PARALLEL_GROUP_SIZE:
-                type: string
-                default: "8"
-              RUN_TEST_IN_DOCKER:
-                type: boolean
-                description: "Run test stage in docker environment"
-                default: 'true'
-              SMOKE_TEST_DOCKER_IMG:
-                type: string
-                default: "ubuntu:16.04"
-      job:
-        test-salt-formulas-env:
-          name: test-salt-formulas-env
-          discard:
-            build:
-              keep_num: 1000
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: true
-          plugin_properties:
-            throttleconcurrents:
-              enabled: true
-              throttle_option: category
-              categories:
-                - test-formula
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: test-salt-formulas-env.groovy
-          param:
-            SALT_VERSION:
-              type: string
-              default: "latest"
-            SALT_OPTS:
-              type: string
-              default: "--force-color"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            DEFAULT_GIT_URL:
-              type: string
-              description: "Run against alternate system reclass"
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
-            DEFAULT_GIT_REF:
-              type: string
-              default: master
-            KITCHEN_ENV:
-              type: text
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 4d661da..a713427 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -1,65 +1,2 @@
-parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
-  jenkins:
-    client:
-      job_template:
-        test-pipelines:
-          name: test-{{name}}
-          jobs:
-            - name: mk-mk-pipelines
-              repo: mk/mk-pipelines
-            - name: mcp-ci-pipeline-library
-              repo: mcp-ci/pipeline-library
-            - name: oss-jenkins-pipelines
-              repo: oss/jenkins/pipelines
-            - name: map-map-pipelines
-              repo: map/map-pipelines
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: test-groovy-pipeline.groovy
-            trigger:
-              gerrit:
-                project:
-                  "{{repo}}":
-                    branches:
-                      - master
-                      - compare_type: ANT
-                        name: release/*
-                event:
-                  patchset:
-                    - created:
-                        excludeDrafts: false
-                        excludeTrivialRebase: false
-                        excludeNoCodeChange: false
-                  comment:
-                    - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
-            param:
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              GRADLE_IMAGE:
-                type: string
-                default: "${_param:mcp_docker_registry}/mirantis/cicd/niaquinto_gradle"
-              GRADLE_CMD:
-                type: string
-                default: "check --info"
-              DEFAULT_GIT_URL:
-                  type: string
-                  description: "Run against alternate system reclass"
-                  default: "${_param:jenkins_gerrit_url}/{{repo}}"
-              DEFAULT_GIT_REF:
-                  type: string
-                  default: master
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file