Merge "CI/CD new parameters."
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 5d719d4..16e4231 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -3,6 +3,7 @@
parameters:
_param:
gerrit_try_login: true
+ gerrit_server_host: ${_param:cluster_vip_address}
gerrit:
client:
enabled: True
@@ -12,7 +13,7 @@
gerrit_config: /srv/volumes/gerrit/etc/gerrit.config
gerrit_secure_config: /srv/volumes/gerrit/etc/secure.config
server:
- host: ${_param:cluster_vip_address}
+ host: ${_param:gerrit_server_host}
user: admin
email: ${_param:gerrit_admin_email}
auth_method: basic
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index c1d600c..80724b1 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -10,8 +10,12 @@
jenkins_master_port: 8081
jenkins_aptly_storages: "local"
jenkins_pipelines_branch: "master"
+ jenkins_offline_deployment: "false"
jenkins:
client:
+ globalenvprop:
+ OFFLINE_DEPLOYMENT:
+ value: ${_param:jenkins_offline_deployment}
master:
host: ${_param:jenkins_master_host}
port: ${_param:jenkins_master_port}
@@ -63,6 +67,7 @@
enabled: true
url: ${_param:jenkins_gerrit_url}/mcp-ci/pipeline-library
credential_id: gerrit
+ branch: ${_param:jenkins_pipelines_branch}
view:
Mirrors:
enabled: true