From 80db87033b05610b8e6cec286a3aba1da9a5e979 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Sun, 13 May 2018 08:41:14 -0500 Subject: [PATCH] Gate: stop pulling default images This PS stops pulling the charts default images, as the make file target cannot target over-rides - resulting in longer gate runs with twice as many images pulled than required in some cases. Change-Id: I04c1d43d6ac9d2f509604709139583b085b406e3 See: https://review.openstack.org/#/c/566738/ --- .zuul.yaml | 1 - tools/deployment/common/010-deploy-docker-registry.sh | 8 ++++---- tools/deployment/common/050-kube-state-metrics.sh | 4 ++-- tools/deployment/common/060-node-exporter.sh | 4 ++-- tools/deployment/common/070-openstack-exporter.sh | 4 ++-- tools/deployment/common/120-kibana.sh | 4 ++-- tools/deployment/developer/030-prometheus.sh | 4 ++-- tools/deployment/developer/040-alertmanager.sh | 4 ++-- tools/deployment/developer/080-grafana.sh | 4 ++-- tools/deployment/developer/090-nagios.sh | 4 ++-- tools/deployment/developer/100-elasticsearch.sh | 4 ++-- tools/deployment/developer/110-fluent-logging.sh | 4 ++-- tools/deployment/multinode/030-prometheus.sh | 4 ++-- tools/deployment/multinode/040-alertmanager.sh | 4 ++-- tools/deployment/multinode/080-grafana.sh | 4 ++-- tools/deployment/multinode/090-nagios.sh | 4 ++-- tools/deployment/multinode/100-elasticsearch.sh | 4 ++-- tools/deployment/multinode/110-fluent-logging.sh | 4 ++-- 18 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 83b9539fe..90f71a271 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -176,7 +176,6 @@ - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-docker.yaml - playbooks/osh-infra-build.yaml - - playbooks/osh-infra-pull-images.yaml - playbooks/osh-infra-deploy-k8s.yaml run: playbooks/osh-infra-multinode-deploy.yaml post-run: playbooks/osh-infra-collect-logs.yaml diff --git a/tools/deployment/common/010-deploy-docker-registry.sh b/tools/deployment/common/010-deploy-docker-registry.sh index d39add9e3..082ed63e1 100755 --- a/tools/deployment/common/010-deploy-docker-registry.sh +++ b/tools/deployment/common/010-deploy-docker-registry.sh @@ -16,10 +16,10 @@ set -xe -#NOTE: Pull images and lint charts for deploying a local docker registry -make pull-images nfs-provisioner -make pull-images redis -make pull-images registry +#NOTE: Lint and package charts for deploying a local docker registry +make nfs-provisioner +make redis +make registry #NOTE: Deploy nfs for the docker registry tee /tmp/docker-registry-nfs-provisioner.yaml << EOF diff --git a/tools/deployment/common/050-kube-state-metrics.sh b/tools/deployment/common/050-kube-state-metrics.sh index e75dcaa1a..21acee4e2 100755 --- a/tools/deployment/common/050-kube-state-metrics.sh +++ b/tools/deployment/common/050-kube-state-metrics.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images prometheus-kube-state-metrics +#NOTE: Lint and package chart +make prometheus-kube-state-metrics #NOTE: Deploy command helm upgrade --install prometheus-kube-state-metrics \ diff --git a/tools/deployment/common/060-node-exporter.sh b/tools/deployment/common/060-node-exporter.sh index 5e03c835f..070472b26 100755 --- a/tools/deployment/common/060-node-exporter.sh +++ b/tools/deployment/common/060-node-exporter.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images prometheus-node-exporter +#NOTE: Lint and package chart +make prometheus-node-exporter #NOTE: Deploy command helm upgrade --install prometheus-node-exporter \ diff --git a/tools/deployment/common/070-openstack-exporter.sh b/tools/deployment/common/070-openstack-exporter.sh index b107e9fe6..1a4bb3eee 100755 --- a/tools/deployment/common/070-openstack-exporter.sh +++ b/tools/deployment/common/070-openstack-exporter.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images prometheus-openstack-exporter +#NOTE: Lint and package chart +make prometheus-openstack-exporter #NOTE: Deploy command tee /tmp/prometheus-openstack-exporter.yaml << EOF diff --git a/tools/deployment/common/120-kibana.sh b/tools/deployment/common/120-kibana.sh index c440011bc..68b1985c9 100755 --- a/tools/deployment/common/120-kibana.sh +++ b/tools/deployment/common/120-kibana.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images kibana +#NOTE: Lint and package chart +make kibana #NOTE: Deploy command helm upgrade --install kibana ./kibana \ diff --git a/tools/deployment/developer/030-prometheus.sh b/tools/deployment/developer/030-prometheus.sh index e4acd671c..cb9baa690 100755 --- a/tools/deployment/developer/030-prometheus.sh +++ b/tools/deployment/developer/030-prometheus.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images prometheus +#NOTE: Lint and package chart +make prometheus #NOTE: Deploy command tee /tmp/prometheus.yaml << EOF diff --git a/tools/deployment/developer/040-alertmanager.sh b/tools/deployment/developer/040-alertmanager.sh index a57e21f5f..74519a95d 100755 --- a/tools/deployment/developer/040-alertmanager.sh +++ b/tools/deployment/developer/040-alertmanager.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images alertmanager +#NOTE: Lint and package chart +make alertmanager #NOTE: Deploy command tee /tmp/prometheus-alertmanager.yaml << EOF diff --git a/tools/deployment/developer/080-grafana.sh b/tools/deployment/developer/080-grafana.sh index 357cded16..5ec2e88f9 100755 --- a/tools/deployment/developer/080-grafana.sh +++ b/tools/deployment/developer/080-grafana.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images grafana +#NOTE: Lint and package chart +make grafana #NOTE: Deploy command tee /tmp/grafana.yaml << EOF diff --git a/tools/deployment/developer/090-nagios.sh b/tools/deployment/developer/090-nagios.sh index d41099edc..d75c476a8 100755 --- a/tools/deployment/developer/090-nagios.sh +++ b/tools/deployment/developer/090-nagios.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images nagios +#NOTE: Lint and package chart +make nagios #NOTE: Deploy command helm upgrade --install nagios ./nagios \ diff --git a/tools/deployment/developer/100-elasticsearch.sh b/tools/deployment/developer/100-elasticsearch.sh index 6f41737eb..f2062d5e4 100755 --- a/tools/deployment/developer/100-elasticsearch.sh +++ b/tools/deployment/developer/100-elasticsearch.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images elasticsearch +#NOTE: Lint and package chart +make elasticsearch #NOTE: Deploy command tee /tmp/elasticsearch.yaml << EOF diff --git a/tools/deployment/developer/110-fluent-logging.sh b/tools/deployment/developer/110-fluent-logging.sh index fd15b3038..ddd179f03 100755 --- a/tools/deployment/developer/110-fluent-logging.sh +++ b/tools/deployment/developer/110-fluent-logging.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images fluent-logging +#NOTE: Lint and package chart +make fluent-logging #NOTE: Deploy command helm upgrade --install fluent-logging ./fluent-logging \ diff --git a/tools/deployment/multinode/030-prometheus.sh b/tools/deployment/multinode/030-prometheus.sh index 3114e6942..fef10dea1 100755 --- a/tools/deployment/multinode/030-prometheus.sh +++ b/tools/deployment/multinode/030-prometheus.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images prometheus +#NOTE: Lint and package chart +make prometheus #NOTE: Deploy command helm upgrade --install prometheus ./prometheus \ diff --git a/tools/deployment/multinode/040-alertmanager.sh b/tools/deployment/multinode/040-alertmanager.sh index 6de8295b9..21f9e01d6 100755 --- a/tools/deployment/multinode/040-alertmanager.sh +++ b/tools/deployment/multinode/040-alertmanager.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images alertmanager +#NOTE: Lint and package chart +make alertmanager #NOTE: Deploy command helm upgrade --install alertmanager ./prometheus-alertmanager \ diff --git a/tools/deployment/multinode/080-grafana.sh b/tools/deployment/multinode/080-grafana.sh index cbb5b8371..dc05d79c6 100755 --- a/tools/deployment/multinode/080-grafana.sh +++ b/tools/deployment/multinode/080-grafana.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images grafana +#NOTE: Lint and package chart +make grafana #NOTE: Deploy command tee /tmp/grafana.yaml << EOF diff --git a/tools/deployment/multinode/090-nagios.sh b/tools/deployment/multinode/090-nagios.sh index edf098349..75100b966 100755 --- a/tools/deployment/multinode/090-nagios.sh +++ b/tools/deployment/multinode/090-nagios.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images nagios +#NOTE: Lint and package chart +make nagios #NOTE: Deploy command helm upgrade --install nagios ./nagios \ diff --git a/tools/deployment/multinode/100-elasticsearch.sh b/tools/deployment/multinode/100-elasticsearch.sh index 8b378e536..7785c76a6 100755 --- a/tools/deployment/multinode/100-elasticsearch.sh +++ b/tools/deployment/multinode/100-elasticsearch.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images elasticsearch +#NOTE: Lint and package chart +make elasticsearch #NOTE: Deploy command tee /tmp/elasticsearch.yaml << EOF diff --git a/tools/deployment/multinode/110-fluent-logging.sh b/tools/deployment/multinode/110-fluent-logging.sh index 519f58c5d..f420791ed 100755 --- a/tools/deployment/multinode/110-fluent-logging.sh +++ b/tools/deployment/multinode/110-fluent-logging.sh @@ -16,8 +16,8 @@ set -xe -#NOTE: Pull images and lint chart -make pull-images fluent-logging +#NOTE: Lint and package chart +make fluent-logging #NOTE: Deploy command helm upgrade --install fluent-logging ./fluent-logging \