Merge "add job for backupninja restore" into release/proposed/2019.2.0
diff --git a/jenkins/client/job/deploy/backupninja_restore.yml b/jenkins/client/job/deploy/backupninja_restore.yml
new file mode 100644
index 0000000..664aa26
--- /dev/null
+++ b/jenkins/client/job/deploy/backupninja_restore.yml
@@ -0,0 +1,26 @@
+
+parameters:
+ jenkins:
+ client:
+ job:
+ backupninja_restore:
+ type: workflow-scm
+ name: backupninja-restore
+ display_name: "Backupninja restore salt-master/MaaS backup"
+ discard:
+ build:
+ keep_num: 50
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: backupninja-restore-pipeline.groovy
+ param:
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index f9afc29..d035b0f 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -20,6 +20,7 @@
- system.jenkins.client.job.deploy.update.kubernetes_update
- system.jenkins.client.job.deploy.galera_verify_restore
- system.jenkins.client.job.deploy.backupninja_backup
+ - system.jenkins.client.job.deploy.backupninja_restore
- system.jenkins.client.job.deploy.update.update_glusterfs
- system.jenkins.client.job.deploy.update.update_glusterfs_servers
- system.jenkins.client.job.deploy.update.update_glusterfs_clients