diff options
Diffstat (limited to 'salt/openbook/ci/files/build.sh')
| -rw-r--r-- | salt/openbook/ci/files/build.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh index 649a1af..73b9a4b 100644 --- a/salt/openbook/ci/files/build.sh +++ b/salt/openbook/ci/files/build.sh @@ -25,32 +25,32 @@ elif [ "${artifact}" == "database" ]; then 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"]["branch"] }}" {{ 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"]["branch"] }}" {{ 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"]["branch"] }}" {{ 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"]["branch"] }}" {{ 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"]["branch"] }}" {{ 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"]["branch"] }}" {{ pillar["workflow_server"]["build_dir"] }}/build.sh else delete_old_image "{{ pillar["baseimage"]["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"] }}" + delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }}" + delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }}" + delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }}" + delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }}" + delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }}" + delete_old_image "{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}" {{ pillar["baseimage"]["build_dir"] }}/build.sh {{ pillar["database"]["build_dir"] }}/build.sh {{ pillar["admin_api_server"]["build_dir"] }}/build.sh |