Merge "Fix gerrit trigger for k8s pipeline."
diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
index 07c001d..ee00912 100644
--- a/devops_portal/service/jenkins.yml
+++ b/devops_portal/service/jenkins.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ oss_jenkins_user: admin
+ oss_jenkins_password: password
devops_portal:
config:
service:
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 96d4e10..e974dee 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -6,8 +6,6 @@
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
- oss_jenkins_user: admin
- oss_jenkins_password: password
docker:
client:
stack:
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 4e3d1d1..6afd67e 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -14,6 +14,7 @@
- method groovy.lang.GroovyObject getProperty java.lang.String
- method groovy.util.Node attributes
- method groovy.util.XmlParser parse java.io.File
+ - method groovy.util.XmlParser parseText java.lang.String
- method hudson.PluginManager getPlugins
- method hudson.PluginWrapper getShortName
- method hudson.model.Item getName
diff --git a/jenkins/client/job/ceph/add-osd-host.yml b/jenkins/client/job/ceph/add-osd-host.yml
new file mode 100644
index 0000000..0c7b629
--- /dev/null
+++ b/jenkins/client/job/ceph/add-osd-host.yml
@@ -0,0 +1,29 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-remove-osd:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - add OSD host"
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: ceph-add-osd-host.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "http://${_param:salt_master_host}:6969"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ HOST:
+ type: string
+ description: OSD HOST that will be added to Ceph cluster
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
index e4f2ba4..4434e09 100644
--- a/jenkins/client/job/ceph/init.yml
+++ b/jenkins/client/job/ceph/init.yml
@@ -1,2 +1,3 @@
classes:
- system.jenkins.client.job.ceph.remove-osd
+- system.jenkins.client.job.ceph.add-osd-host