Merge "Update script approvals"
diff --git a/gerrit/client/project/ci.yml b/gerrit/client/project/ci.yml
new file mode 100644
index 0000000..f1fdcd1
--- /dev/null
+++ b/gerrit/client/project/ci.yml
@@ -0,0 +1,20 @@
+parameters:
+ gerrit:
+ client:
+ project:
+ mcp-ci/pipeline-library:
+ enabled: true
+ description: Jenkins pipeline libraries
+ upstream: https://github.com/Mirantis/pipeline-library
+ access: ${gerrit:client:default_access}
+ require_change_id: true
+ require_agreement: false
+ merge_content: true
+ mk/mk-pipelines:
+ enabled: true
+ description: Jenkins pipelines
+ upstream: https://github.com/Mirantis/mk-pipelines
+ access: ${gerrit:client:default_access}
+ require_change_id: true
+ require_agreement: false
+ merge_content: true
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 2f9b90b..f411c39 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -15,33 +15,32 @@
user: ${_param:jenkins_client_user}
password: ${_param:jenkins_client_password}
plugin:
- slack: {}
- extended-choice-parameter: {}
- rebuild: {}
- test-stability: {}
+ ansicolor: {}
build-blocker-plugin: {}
+ build-monitor-plugin: {}
+ build-user-vars-plugin: {}
+ categorized-view: {}
+ description-setter: {}
+ discard-old-build: {}
+ docker-workflow: {}
+ extended-choice-parameter: {}
+ gerrit-trigger: {}
+ git: {}
heavy-job: {}
+ matrix-auth: {}
+ monitoring: {}
+ pipeline-utility-steps: {}
+ rebuild: {}
+ simple-theme-plugin: {}
+ slack: {}
+ test-stability: {}
+ timestamper: {}
workflow-cps: {}
workflow-remote-loader: {}
- workflow-scm-step: {}
- docker-workflow: {}
- gerrit-trigger: {}
- pipeline-utility-steps: {}
- discard-old-build: {}
- ansicolor: {}
- timestamper: {}
- build-user-vars-plugin: {}
- description-setter: {}
- build-monitor-plugin: {}
- categorized-view: {}
- monitoring: {}
- matrix-auth: {}
- simple-theme-plugin: {}
- theme:
- css_url: /userContent/theme/mirantis.css
- js_url: /userContent/theme/mirantis.js
- lib:
- pipeline-library:
- enabled: true
- url: ${_param:jenkins_gerrit_url}/mcp-ci/pipeline-library
- credential_id: gerrit
+ workflow-scm-step:
+ restart: true
+ lib:
+ pipeline-library:
+ enabled: true
+ url: ${_param:jenkins_gerrit_url}/mcp-ci/pipeline-library
+ credential_id: gerrit
diff --git a/jenkins/client/job/deploy/update/saltenv.yml b/jenkins/client/job/deploy/update/saltenv.yml
index 5b55f82..0303aea 100644
--- a/jenkins/client/job/deploy/update/saltenv.yml
+++ b/jenkins/client/job/deploy/update/saltenv.yml
@@ -11,7 +11,7 @@
update_salt_env:
name: deploy-update-{{name}}
jobs:
- - name: ${_param:jenkins_salt_env_name}
+ - name: ${_param:jenkins_salt_model_name}
salt_url: "${_param:jenkins_salt_api_url}"
salt_credentials: salt
template: