commit 01c5fd25445a2ae9e373146186d792f0d5423919
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Apr 25 11:35:06 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Apr 25 11:35:06 2019 +0000
tree 2c18c6cd2350e13caf6966e08703b06b8f9cdcc0
parent 8adde140a02374e0d63e8146c3141009cda636a2
parent 6fc81d1e9383f39722b95e9b4889f0ed446b2db7

Merge "Set sf-notifier image tag to 0.2-mcp0"

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 0018e84..a99be69 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -29,7 +29,7 @@
     docker_image_alerta: "${_param:mcp_docker_registry}/mirantis/external/alerta-web:${_param:mcp_version}"
     docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:${_param:mcp_version}"
     docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
-    docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/mirantis/external/braedon/prometheus-es-exporter:0.5.1"
+    docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:0.5.1-mcp0"
     docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
     docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:${_param:mcp_version}"
     docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"

jenkins/client/job/git-mirrors/downstream/init.yml

diff --git a/jenkins/client/job/git-mirrors/downstream/init.yml b/jenkins/client/job/git-mirrors/downstream/init.yml
index 8803f18..fbfcd56 100644
--- a/jenkins/client/job/git-mirrors/downstream/init.yml
+++ b/jenkins/client/job/git-mirrors/downstream/init.yml
@@ -1,7 +1,6 @@
 parameters:
   _param:
     jenkins_git_mirror_downstream_jobs: []
-    jenkins_pollscm_spec: "H/60 * * * *"
   jenkins:
     client:
       job_template:
@@ -22,9 +21,6 @@
               branch: "${_param:jenkins_pipelines_branch}"
               credentials: "gerrit"
               script: git-mirror-pipeline.groovy
-            trigger:
-              pollscm:
-                spec: ${_param:jenkins_pollscm_spec}
             param:
               SOURCE_URL:
                 type: string