From 8c238d558b8bca11cab5a0fb0989dca288e09063 Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Thu, 9 Nov 2017 15:09:19 -0700
Subject: Openbook CI: autoclean docker registry

Closes-Bug: OB-1089
---
 salt/openbook/ci/files/build.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh
index 0b8df0d..c9a78bc 100644
--- a/salt/openbook/ci/files/build.sh
+++ b/salt/openbook/ci/files/build.sh
@@ -20,34 +20,34 @@ echo "Login to docker registry"
 docker login --username {{ pillar["registry"]["username"] }} --password {{ pillar["registry"]["password"] }} {{ pillar["registry"]["url"] }}
 
 if [ "${artifact}" == "database" ]; then
-    delete_old_image("{{ pillar["database"]["image_name"] }}")
+    delete_old_image "{{ pillar["database"]["image_name"] }}"
     {{ pillar["database"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "admin-api-server" ]; then
-    delete_old_image("{{ pillar["admin_api_server"]["image_name"] }}")
+    delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}"
     {{ pillar["admin_api_server"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "customer-api-server" ]; then
-    delete_old_image("{{ pillar["customer_api_server"]["image_name"] }}")
+    delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}"
     {{ pillar["customer_api_server"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "admin-web-ui" ]; then
-    delete_old_image("{{ pillar["admin_web_ui"]["image_name"] }}")
+    delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}"
     {{ pillar["admin_web_ui"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "customer-web-ui" ]; then
-    delete_old_image("{{ pillar["customer_web_ui"]["image_name"] }}")
+    delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}"
     {{ pillar["customer_web_ui"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "job-scheduler-server" ]; then
-    delete_old_image("{{ pillar["job_scheduler_server"]["image_name"] }}")
+    delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}"
     {{ pillar["job_scheduler_server"]["build_dir"] }}/build.sh
 elif [ "${artifact}" == "workflow-server" ]; then
-    delete_old_image("{{ pillar["workflow_server"]["image_name"] }}")
+    delete_old_image "{{ pillar["workflow_server"]["image_name"] }}"
     {{ pillar["workflow_server"]["build_dir"] }}/build.sh
 else
-    delete_old_image("{{ pillar["database"]["image_name"] }}")
-    delete_old_image("{{ pillar["admin_api_server"]["image_name"] }}")
-    delete_old_image("{{ pillar["customer_api_server"]["image_name"] }}")
-    delete_old_image("{{ pillar["admin_web_ui"]["image_name"] }}")
-    delete_old_image("{{ pillar["customer_web_ui"]["image_name"] }}")
-    delete_old_image("{{ pillar["job_scheduler_server"]["image_name"] }}")
-    delete_old_image("{{ pillar["workflow_server"]["image_name"] }}")
+    delete_old_image "{{ pillar["database"]["image_name"] }}"
+    delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}"
+    delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}"
+    delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}"
+    delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}"
+    delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}"
+    delete_old_image "{{ pillar["workflow_server"]["image_name"] }}"
     {{ pillar["database"]["build_dir"] }}/build.sh
     {{ pillar["admin_api_server"]["build_dir"] }}/build.sh
     {{ pillar["customer_api_server"]["build_dir"] }}/build.sh
-- 
cgit v1.3