Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
bbc85563 Add ARCHIVE_RECLASS_INVENTORY parameter to upgrade-mcp-release job Partial-bug: PROD-36641 Change-Id: Iaca1fa54b46ab496e45fbfa07d811c9b9f963121
a56b26c5 Update docker images
959de35e Create a jenkins job for pre-upgade checking
54fd8f37 Update vkhlyunev ssh key
41d858c7 Bump prometheus-es-exporter to v0.14.0
c940dcb8 Bump telegraf Docker image to 2019.2.17
Change-Id: Ic9289a74137dcb19bd825923b06b94d891babc87
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 0fc27f6..6ecc736 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -11,14 +11,14 @@
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:2019.2.6"
###
# phpldapadmin:0.9.0
- docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.15"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.17"
# gerrit:2.15.18
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:2019.2.11"
# mysql:5.6.51
- docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.15"
+ docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.17"
# jenkins:2.263.4
docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.16"
- docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.16"
+ docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.17"
# TODO: fix tag
docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.16"
# model-generator
@@ -30,16 +30,16 @@
docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.16"
docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:2019.2.14"
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.16"
- # docker-kaas-local.artifactory.mirantis.com/stacklight/prometheus-es-exporter:v0.5.1-20210323132924
- docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.14"
+ # docker-dev-kaas-virtual.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20210812120726
+ docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.17"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
- # http://docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20210920100947
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.16"
+ # http://docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20211122164045
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.17"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:2019.2.6"
docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.11"
docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.14"
# docker-kaas-local.artifactory.mirantis.com/stacklight/telegraf:v1.9.1-20210225142050
- docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.14"
+ docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.17"
docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:2019.2.6"
docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:2019.2.6"
# mirantis.azurecr.io/stacklight/sf-notifier:v0.3-20210617140951
@@ -85,7 +85,7 @@
name: postgres:9.6.22-alpine
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:2019.2.15
+ name: phpldapadmin:2019.2.17
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
@@ -99,7 +99,7 @@
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jnlp-slave:2019.2.16
+ name: jnlp-slave:2019.2.17
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: ssh-slave:2019.2.16
@@ -133,10 +133,10 @@
name: prometheus:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: sf-reporter:2019.2.16
+ name: sf-reporter:2019.2.17
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: telegraf:2019.2.14
+ name: telegraf:2019.2.17
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: remote_storage_adapter:2019.2.6
@@ -157,7 +157,7 @@
name: gainsight_elasticsearch:2019.2.6
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus-es-exporter:2019.2.14
+ name: prometheus-es-exporter:2019.2.17
# OpenContrail 4.1
- registry: ${_param:mcp_docker_registry}/opencontrail-oc41
@@ -192,7 +192,7 @@
#
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: mysql:2019.2.15
+ name: mysql:2019.2.17
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
name: mongo:2019.2.6
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
index 8afa45f..c494b8e 100644
--- a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -61,7 +61,43 @@
APPLY_MODEL_WORKAROUNDS: true
# Next parameters added only for test purposes and not enabled by default
# RECLASS_SYSTEM_BRANCH: ''
+ ARCHIVE_RECLASS_INVENTORY: false
PIPELINE_TIMEOUT:
type: string
default: '12'
description: "Sets pipeline timeout in hours. Defaults to '12' if left empty."
+ pre-upgrade-verify:
+ type: workflow-scm
+ concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ display_name: "Deploy - pre upgrade verify MCP Drivetrain"
+ scm:
+ remote_name: origin
+ refspec: "$MK_PIPELINES_REFSPEC"
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ script: pre-upgrade-verify.groovy
+ type: git
+ credentials: ${_param:jenkins_gerrit_credentials}
+ branch: FETCH_HEAD
+ wipe_workspace: True
+ param:
+ MK_PIPELINES_REFSPEC:
+ type: string
+ default: ""
+ description: "Version of mk-pipelines git repo to be used. Should be release/TARGET_MCP_VERSION or 2019.2.x for a specific MU"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API
+ PIPELINE_TIMEOUT:
+ type: string
+ default: '1'
+ description: "Sets pipeline timeout in hours. Defaults to '1' if left empty."
diff --git a/openssh/server/team/members/vkhlyunev.yml b/openssh/server/team/members/vkhlyunev.yml
index dce6e28..4661358 100644
--- a/openssh/server/team/members/vkhlyunev.yml
+++ b/openssh/server/team/members/vkhlyunev.yml
@@ -15,5 +15,5 @@
vkhlyunev:
enabled: true
public_keys:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1v5pWSan9H2Wl64C8bKWmbULp0QgJUi9FqPyuw1bfS5GfHLxejPxaDzec0uSx0PXWzS9afwIO7aGA1dg+dvdl1iPy9jfpkQbGGsusmSsbLvf6+WLVsPk90Bvoc4anmEsG2DWT1SGR65d/imjlwsnlbHTQIm0YucjDjV/p2MmYlbaFLm+ynfo9mt1mP954GDPKQHvyBpxvAIEHL3xAcnNXcpSXm2jhCNsNGUSpY+R7gin2q8MtrpzQNeZZ8degUMpgba7CTXN1sws2dc3UayJ8KZkyRVJNk6mpt2jey03izJzXzt3ux3hg5lToELvEIMDdHOPHT0b0U7f2H+eBCfH/ vkhlyunev@cz7317
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeGiSOs0zAwcxuc9y6BzidYFXQXLOLcBKSoW1tPYJ+bVGRwNRVh63/+/X+eOPbBp6xTNNHVyOpYHt1WUbIHsAqAx/XbzBp+j3/4+8+ucvWR3X9TTxK7Q+oB3SSy2iEeimiJmxfjiHu1hfcgN8L9YvXVquGC/EZbk/r27j7Gcxli7zesr9/kBBhigDSQeehJBJZ0ux3luVkjWSDYTeKqZhNNPFoD6eWmOfsAKNMhe/8IRD9e0zY4MsELi1tZl2zoQ69249e4M1aCuGxm+t+tHLzywX0tVZmM1yX7TDuszHbiii8HrjNwB1/K80HRwRrwVIne9P7wFSlC2exLkdfWd2D vkhlyunev
user: ${linux:system:user:vkhlyunev}