Merge "Add nova service user metadata" into release/2019.2.0
diff --git a/defaults/backupninja.yml b/defaults/backupninja.yml
index e89ed86..f827173 100644
--- a/defaults/backupninja.yml
+++ b/defaults/backupninja.yml
@@ -1,4 +1,5 @@
parameters:
_param:
backupninja_engine: rsync
+ backupninja_backup_host: 127.0.0.1
backupninja_public_key: no-key-provided
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index a05b1ad..5a26020 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -12,9 +12,9 @@
- system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
- system.jenkins.client.job.deploy.update.update_opencontrail4
- system.jenkins.client.job.deploy.update.upgrade_stacklight
- - system.jenkins.client.job.deploy.update.restore_mysql
- system.jenkins.client.job.deploy.update.restore_cassandra
- system.jenkins.client.job.deploy.update.restore_zookeeper
- system.jenkins.client.job.deploy.update.virt_snapshot
- system.jenkins.client.job.deploy.update.cloud_update
- system.jenkins.client.job.deploy.update.kubernetes_update
+ - system.jenkins.client.job.deploy.galera_verify_restore
diff --git a/jenkins/client/job/deploy/update/restore_mysql.yml b/jenkins/client/job/deploy/update/restore_mysql.yml
deleted file mode 100644
index aaf4552..0000000
--- a/jenkins/client/job/deploy/update/restore_mysql.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Jobs to update packages on given Salt master environment
-#
-parameters:
- _param:
- jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- jenkins:
- client:
- job:
- deploy-mysql-db-restore:
- type: workflow-scm
- concurrent: true
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- display_name: "Xtrabackup - restore mysql db"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: xtrabackup-restore-mysql-db.groovy
- param:
- SALT_MASTER_URL:
- type: string
- default: "${_param:jenkins_salt_api_url}"
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
-
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index e0fd821..fbec27c 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -8,8 +8,8 @@
- name: pipeline-library
downstream: mcp-ci/pipeline-library
upstream: "${_param:gerrit_pipeline_library_repo}"
- branches: "master,release/2018.8.1,release/2018.11.0,release/2019.2.0"
+ branches: "*"
- name: mk-pipelines
downstream: mk/mk-pipelines
upstream: "${_param:gerrit_mk_pipelines_repo}"
- branches: "master,release/2018.8.1,release/2018.11.0,release/2019.2.0"
\ No newline at end of file
+ branches: "*"
\ No newline at end of file