Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
53cf5039 Fix CVE in docker images
20f28e3e Pin cvp-checks image PROD-37203
Change-Id: I469a363c77f5d7f6c01f314a8c57c93dbc101f2c
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 4e5500f..17abc16 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,55 +1,54 @@
parameters:
_param:
- # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1685008391535
- docker_image_alerta_tag: "2019.2.24"
+ # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1692348098527
+ docker_image_alerta_tag: "2019.2.25"
docker_image_alertmanager_tag: "2019.2.21"
- docker_image_aptly_base_tag: "2019.2.24"
- docker_image_aptly_public_tag: "2019.2.24"
- docker_image_aptly_publisher_tag: "2019.2.24"
+ docker_image_aptly_base_tag: "2019.2.25"
+ docker_image_aptly_public_tag: "2019.2.25"
+ docker_image_aptly_publisher_tag: "2019.2.25"
docker_image_cockroachdb_tag: "v2.1.1"
- docker_image_compose_tag: "1.17.1"
+ docker_image_compose_tag: "2019.2.25"
docker_image_cvp_rally_tag: "2019.2.5"
- docker_image_cvp_sanity_checks_tag: "2019.2.24"
+ docker_image_cvp_sanity_checks_tag: "2019.2.25"
docker_image_cvp_shaker_checks_tag: "2019.2.14"
docker_image_cvp_tempest_tag: "${_param:openstack_version}"
docker_image_cvp_xrally_tag: "0.11.2"
- docker_image_gerrit_tag: "2019.2.24"
+ docker_image_gerrit_tag: "2019.2.25"
docker_image_grafana_tag: "2019.2.23"
- docker_image_jenkins_jnlp_slave_tag: "2019.2.24"
- docker_image_jenkins_ssh_slave_tag: "2019.2.24"
+ docker_image_jenkins_jnlp_slave_tag: "2019.2.25"
+ docker_image_jenkins_ssh_slave_tag: "2019.2.25"
docker_image_jenkins_tag: "2019.2.24"
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.24"
+ docker_image_mysql_tag: "2019.2.25"
docker_image_openldap_tag: "2019.2.24"
docker_image_operations_api_tag: "2019.2.6"
docker_image_operations_ui_tag: "2019.2.6"
- docker_image_phpldapadmin_tag: "2019.2.24"
- docker_image_postgresql_tag: "2019.2.24"
- # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20230519023018
- docker_image_prometheus_es_exporter_tag: "2019.2.24"
+ docker_image_phpldapadmin_tag: "2019.2.25"
+ docker_image_postgresql_tag: "2019.2.25"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20230818023016
+ docker_image_prometheus_es_exporter_tag: "2019.2.25"
docker_image_prometheus_gainsight_elasticsearch_tag: "2019.2.6"
- # docker-prod-local.docker.mirantis.net/stacklight/sf-reporter:mcp-v0.1-nightly
- docker_image_prometheus_gainsight_tag: "2019.2.23"
+ docker_image_prometheus_gainsight_tag: "2019.2.25"
docker_image_prometheus_relay_tag: "2019.2.11"
docker_image_prometheus_tag: "2019.2.23"
docker_image_pushgateway_tag: "2019.2.14"
- docker_image_registry_tag: "2019.2.6"
+ docker_image_registry_tag: "2019.2.25"
# docker-dev-kaas-local.docker.mirantis.net/stacklight/telegraf:v1.9.1-20230418061152
docker_image_remote_agent_tag: "2019.2.24"
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-20230217120830
docker_image_sf_notifier_tag: "2019.2.24"
- docker_image_visualizer_tag: "2019.2.6"
+ docker_image_visualizer_tag: "2019.2.25"
opencontrail_docker_image_tag: "2019.2.22"
# CI\CD
- docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/docker/compose:${_param:docker_image_compose_tag}"
+ docker_image_compose: "${_param:mcp_docker_registry}/mirantis/cicd/compose:${_param:docker_image_compose_tag}"
# 2.6.2 version, from 12/18/2108, differ from latest 2.6.2 upstream - update next cycle
- docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:docker_image_registry_tag}"
- docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:docker_image_visualizer_tag}"
+ docker_image_registry: "${_param:mcp_docker_registry}/mirantis/cicd/registry:${_param:docker_image_registry_tag}"
+ docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/cicd/visualizer:${_param:docker_image_visualizer_tag}"
docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:${_param:docker_image_openldap_tag}"
docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/cicd/postgresql:${_param:docker_image_postgresql_tag}"
# 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
@@ -108,14 +107,14 @@
docker_client_registry_target_registry: "apt:5000"
docker_client_registry_image:
# CI/CD
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
+ - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: registry:${_param:docker_image_registry_tag}
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
+ - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: visualizer:${_param:docker_image_visualizer_tag}
- - registry: ${_param:mcp_docker_registry}/mirantis/external/docker
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/docker
+ - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: compose:${_param:docker_image_compose_tag}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd