commit d1842e65111059d91b47b2d50f5656f99796c5f0
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jul 03 11:38:28 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed Jul 03 11:38:28 2019 +0000
tree acdd42191f3d682e50c1101ff12efb9a52526682
parent 1b88a98b53176ad6595f8a0eea85f34b1583df97
parent 937868bd613b67026fcbfa43bdf42042f05e0316

Merge "Remove old deploy-update-{{name}} jenkins job template" into release/proposed/2019.2.0

jenkins/client/job/deploy/update/init.yml

diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index d035b0f..8efaad7 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -1,7 +1,6 @@
 classes:
   - system.jenkins.client.job.deploy.update.package
   - system.jenkins.client.job.deploy.update.config
-  - system.jenkins.client.job.deploy.update.saltenv
   - system.jenkins.client.job.deploy.update.update_mirror_image
   - system.jenkins.client.job.deploy.update.update_ceph
   - system.jenkins.client.job.deploy.update.upgrade

jenkins/client/job/deploy/update/saltenv.yml

diff --git a/jenkins/client/job/deploy/update/saltenv.yml b/jenkins/client/job/deploy/update/saltenv.yml
deleted file mode 100644
index f2b38d2..0000000
--- a/jenkins/client/job/deploy/update/saltenv.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Following job is about to simply execute Jenkinsfile of given Reclass model
-#
-parameters:
-  _param:
-    jenkins_salt_model_name: "salt"
-    jenkins_salt_model_branch: "master"
-  jenkins:
-    client:
-      job_template:
-        update_salt_env:
-          name: deploy-update-{{name}}
-          jobs:
-            - name: ${_param:jenkins_salt_model_name}
-              salt_url: "${_param:jenkins_salt_api_url}"
-              salt_credentials: salt
-          template:
-            display_name: "Deploy - update {{name}} environment"
-            type: workflow-scm
-            concurrent: false
-            discard:
-              build:
-                keep_num: 10
-              artifact:
-                keep_num: 10
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
-              branch: ${_param:jenkins_salt_model_branch}
-              credentials: "gerrit"
-              script: Jenkinsfile
-            param:
-              SALT_MASTER_URL:
-                type: string
-                default: "{{salt_url}}"
-              SALT_MASTER_CREDENTIALS:
-                type: string
-                default: "{{salt_credentials}}"
-              UPDATE_FORMULAS:
-                type: boolean
-                default: "true"