Merge "Update ceph job: remove of unused param Related-Prod: #PROD-30065 (PROD:30065) Related-Prod: #PROD-29949 (PROD:29949)" into release/proposed/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index abf5b72..909ef05 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -35,9 +35,9 @@
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:2019.2.4"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"
- docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus_relay:${_param:mcp_version}"
+ docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.5"
docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:${_param:mcp_version}"
- docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.4"
+ docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.5"
docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:${_param:mcp_version}"
docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:${_param:mcp_version}"
docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf_notifier:2019.2.4"
@@ -48,7 +48,10 @@
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
docker_image_cvp_sanity_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.5
+ docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
docker_image_cvp_shaker_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.3
+ docker_image_cvp_rally: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5
+ docker_image_cvp_xrally: xrally/xrally-openstack:0.11.2
# aptly
docker_image_aptly:
base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
diff --git a/defaults/xtrabackup.yml b/defaults/xtrabackup.yml
index e2bf995..2920598 100644
--- a/defaults/xtrabackup.yml
+++ b/defaults/xtrabackup.yml
@@ -3,4 +3,3 @@
xtrabackup_qpress_source: pkg
xtrabackup_qpress_source_name: qpress
xtrabackup_public_key: no-key-provided
- xtrabackup_remote_server: cfg01
diff --git a/docker/client/images/cvp.yml b/docker/client/images/cvp.yml
new file mode 100644
index 0000000..64c99a5
--- /dev/null
+++ b/docker/client/images/cvp.yml
@@ -0,0 +1,12 @@
+parameters:
+ docker:
+ client:
+ enabled: true
+ images:
+ - ${_param:docker_image_cvp_sanity_checks}
+ - ${_param:docker_image_cvp_tempest}
+ - ${_param:docker_image_cvp_shaker_checks}
+ - ${_param:docker_image_cvp_rally}
+ # xrally is not required for offline,
+ # use cvp_rally instead
+ # - ${_param:docker_image_cvp_xrally}
diff --git a/docker/swarm/stack/jenkins/jnlp_slave_multi.yml b/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
index 5246cb7..3606bad 100644
--- a/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
+++ b/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
@@ -20,6 +20,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -29,6 +30,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
@@ -44,6 +46,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -53,6 +56,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/jnlp_slave_single.yml b/docker/swarm/stack/jenkins/jnlp_slave_single.yml
index 8b05c47..956f918 100644
--- a/docker/swarm/stack/jenkins/jnlp_slave_single.yml
+++ b/docker/swarm/stack/jenkins/jnlp_slave_single.yml
@@ -24,6 +24,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -33,6 +34,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 6ec6afb..9f3f0c2 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -23,6 +23,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: ${_param:docker_no_proxy}
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -33,3 +34,4 @@
volumes:
- /srv/volumes/jenkins:/var/jenkins_home
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
diff --git a/docker/swarm/stack/jenkins/ssh_slave_multi.yml b/docker/swarm/stack/jenkins/ssh_slave_multi.yml
index 2959e4d..5eafe44 100644
--- a/docker/swarm/stack/jenkins/ssh_slave_multi.yml
+++ b/docker/swarm/stack/jenkins/ssh_slave_multi.yml
@@ -15,6 +15,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -24,6 +25,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
@@ -34,6 +36,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -43,6 +46,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/ssh_slave_single.yml b/docker/swarm/stack/jenkins/ssh_slave_single.yml
index dbdaf1d..f4e16a2 100644
--- a/docker/swarm/stack/jenkins/ssh_slave_single.yml
+++ b/docker/swarm/stack/jenkins/ssh_slave_single.yml
@@ -17,6 +17,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -26,6 +27,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/jenkins/client/job/deploy/galera_database_backup.yml b/jenkins/client/job/deploy/galera_database_backup.yml
new file mode 100644
index 0000000..e78c29b
--- /dev/null
+++ b/jenkins/client/job/deploy/galera_database_backup.yml
@@ -0,0 +1,33 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ galera_backup_database:
+ type: workflow-scm
+ name: galera-database-backup
+ display_name: "Galera database 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: galera-database-backup-pipeline.groovy
+ param:
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ OVERRIDE_BACKUP_NODE:
+ type: string
+ default: "none"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ ASK_CONFIRMATION:
+ type: boolean
+ default: 'true'
+ triggers:
+ - timed: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 9e98166..09b5b55 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -386,7 +386,7 @@
---
DEBUG_MODE: false
GENERATE_CONFIG: true
- TEST_IMAGE: "docker-prod-virtual.docker.mirantis.net/mirantis/cicd/ci-tempest:${_param:openstack_version}"
+ TEST_IMAGE: "${_param:docker_image_cvp_tempest}"
report_prefix: "cvp_"
description: YAML context with additional parameters
cvp-perf:
diff --git a/xtrabackup/client/single.yml b/xtrabackup/client/single.yml
index 25fa6d2..c67925a 100644
--- a/xtrabackup/client/single.yml
+++ b/xtrabackup/client/single.yml
@@ -6,4 +6,10 @@
xtrabackup_client_throttle: 0 # disabled
xtrabackup:
client:
+ cron: false
throttle: ${_param:xtrabackup_client_throttle}
+ linux:
+ system:
+ package:
+ sysstat:
+ version: latest
\ No newline at end of file
diff --git a/xtrabackup/server/single.yml b/xtrabackup/server/single.yml
index 92d9fc3..d440e48 100644
--- a/xtrabackup/server/single.yml
+++ b/xtrabackup/server/single.yml
@@ -3,6 +3,7 @@
parameters:
xtrabackup:
server:
+ cron: false
backup_dir: /srv/volumes/backup/xtrabackup
key:
xtrabackup_pub_key:
@@ -13,3 +14,6 @@
user:
xtrabackup:
enabled: true
+ package:
+ sysstat:
+ version: latest
\ No newline at end of file