Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
f2e0ec85 Bump Prometheus to 2019.2.23
1b806c3d Update docker images
5a6b3398 Migrate git mirroring source data to cluster model
Change-Id: Iaeb9daa677798fe5bbfcf7e5de14b2cdc760c99d
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 7f6ed43..e835488 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,11 +1,11 @@
parameters:
_param:
- # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1650474694302
- docker_image_alerta_tag: "2019.2.22"
+ # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1677064533758
+ docker_image_alerta_tag: "2019.2.23"
docker_image_alertmanager_tag: "2019.2.21"
- docker_image_aptly_base_tag: "2019.2.19"
- docker_image_aptly_public_tag: "2019.2.19"
- docker_image_aptly_publisher_tag: "2019.2.22"
+ docker_image_aptly_base_tag: "2019.2.23"
+ docker_image_aptly_public_tag: "2019.2.23"
+ docker_image_aptly_publisher_tag: "2019.2.23"
docker_image_cockroachdb_tag: "v2.1.1"
docker_image_compose_tag: "1.17.1"
docker_image_cvp_rally_tag: "2019.2.5"
@@ -14,34 +14,34 @@
docker_image_cvp_tempest_tag: "${_param:openstack_version}"
docker_image_cvp_xrally_tag: "0.11.2"
docker_image_gerrit_tag: "2019.2.11"
- docker_image_grafana_tag: "2019.2.19"
- docker_image_jenkins_jnlp_slave_tag: "2019.2.22"
- docker_image_jenkins_ssh_slave_tag: "2019.2.22"
- docker_image_jenkins_tag: "2019.2.19"
+ docker_image_grafana_tag: "2019.2.23"
+ docker_image_jenkins_jnlp_slave_tag: "2019.2.23"
+ docker_image_jenkins_ssh_slave_tag: "2019.2.23"
+ docker_image_jenkins_tag: "2019.2.23"
docker_image_keycloak_proxy_tag: "3.4.2.Final"
docker_image_keycloak_server_tag: "4.5.0.Final"
docker_image_mongodb_tag: "2019.2.6"
- docker_image_mysql_tag: "2019.2.22"
- docker_image_openldap_tag: "2019.2.22"
+ docker_image_mysql_tag: "2019.2.23"
+ docker_image_openldap_tag: "2019.2.23"
docker_image_operations_api_tag: "2019.2.6"
docker_image_operations_ui_tag: "2019.2.6"
- docker_image_phpldapadmin_tag: "2019.2.22"
+ docker_image_phpldapadmin_tag: "2019.2.23"
docker_image_postgresql_tag: "2019.2.22"
- # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:extra-xenial-1669116465768
- docker_image_prometheus_es_exporter_tag: "2019.2.22"
+ # docker-prod-local.docker.mirantis.net/mcp/prometheus-es-exporter:extra-xenial-1676635711342
+ docker_image_prometheus_es_exporter_tag: "2019.2.23"
docker_image_prometheus_gainsight_elasticsearch_tag: "2019.2.6"
- # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220916113234
- docker_image_prometheus_gainsight_tag: "2019.2.22"
+ # docker-prod-local.docker.mirantis.net/stacklight/sf-reporter:mcp-v0.1-nightly
+ docker_image_prometheus_gainsight_tag: "2019.2.23"
docker_image_prometheus_relay_tag: "2019.2.11"
- docker_image_prometheus_tag: "2019.2.14"
+ docker_image_prometheus_tag: "2019.2.23"
docker_image_pushgateway_tag: "2019.2.14"
docker_image_registry_tag: "2019.2.6"
# docker-kaas-local.artifactory.mirantis.com/stacklight/telegraf:v1.9.1-20210225142050
docker_image_remote_agent_tag: "2019.2.17"
docker_image_remote_collector_tag: "2019.2.6"
docker_image_remote_storage_adapter_tag: "2019.2.6"
- # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20221103105502
- docker_image_sf_notifier_tag: "2019.2.22"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20230217120830
+ docker_image_sf_notifier_tag: "2019.2.23"
docker_image_visualizer_tag: "2019.2.6"
opencontrail_docker_image_tag: "2019.2.22"
diff --git a/defaults/git/init.yml b/defaults/git/init.yml
index 88bfc96..e69de29 100644
--- a/defaults/git/init.yml
+++ b/defaults/git/init.yml
@@ -1,19 +0,0 @@
-parameters:
- _param:
- # List of repos, to be placed into offline image, during separate image build process
- # By default, will be avaible http_server
- # WARNING: file path and names - must be exactly same as in any other place in reclass-system or model!
- default_local_mirrror_content:
- git_server_repos:
- - name: mk-pipelines
- url: https://gerrit.mcp.mirantis.com/mk/mk-pipelines
- - name: pipeline-library
- url: https://gerrit.mcp.mirantis.com/mcp-ci/pipeline-library
- - name: reclass-system
- url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system
- - name: cvp-sanity-checks
- url: https://gerrit.mcp.mirantis.com/mcp/cvp-sanity-checks
- - name: stacklight-pytest
- url: https://gerrit.mcp.mirantis.com/mcp/stacklight-pytest
- - name: cvp-configuration
- url: https://gerrit.mcp.mirantis.com/mcp/cvp-configuration