diff options
Diffstat (limited to 'salt/openbook/ci')
| -rw-r--r-- | salt/openbook/ci/files/build.sh | 24 | ||||
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 12 |
2 files changed, 18 insertions, 18 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 diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index a316bb5..24c87bc 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -61,22 +61,22 @@ do_start() { do_stop() { {% raw %}{% if "True" == openbook_install_customer_web_ui|string() %}{% endraw %} - docker stop {{ pillar["customer_web_ui"]["container_name"] }} + docker stop {{ pillar["customer_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_admin_web_ui|string() %}{% endraw %} - docker stop {{ pillar["admin_web_ui"]["container_name"] }} + docker stop {{ pillar["admin_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_customer_api_server|string() %}{% endraw %} - docker stop {{ pillar["customer_api_server"]["container_name"] }} + docker stop {{ pillar["customer_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_admin_api_server|string() %}{% endraw %} - docker stop {{ pillar["admin_api_server"]["container_name"] }} + docker stop {{ pillar["admin_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_workflow_server|string() %}{% endraw %} - docker stop {{ pillar["workflow_server"]["container_name"] }} + docker stop {{ pillar["workflow_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_job_scheduler_server|string() %}{% endraw %} - docker stop {{ pillar["job_scheduler_server"]["container_name"] }} + docker stop {{ pillar["job_scheduler_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %} docker stop {{ pillar["database"]["container_name"] }} |