From aae461e23485940a10abda415a4d64677cb8e02f Mon Sep 17 00:00:00 2001 From: Matheus Miranda Date: Mon, 6 May 2019 16:40:57 -0300 Subject: [PATCH 1/7] Update Gitlab CI config to new architecture Signed-off-by: Matheus Miranda --- .gitlab-ci.yml | 57 ++++++++++++++++++++++++++++++------------- scripts/deploy_bot.sh | 10 ++++---- scripts/deploy_web.sh | 8 +++--- 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38235556..c514b1cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,10 @@ stages: - test style - validate format - test stories + - build requirements - build - deploy -variables: - BOT_LATEST_IMAGE: $CI_REGISTRY_IMAGE/bot:latest - WEB_LATEST_IMAGE: $CI_REGISTRY_IMAGE/web:latest - .set_ssh_config: &set_ssh_config before_script: - apt-get update -y @@ -26,20 +23,47 @@ test style: run dataset validator: stage: validate format - image: registry.gitlab.com/lappis-unb/services/tais/bot + image: lappis/coach:latest script: - cd coach/ - make run-validator test stories: stage: test stories - image: registry.gitlab.com/lappis-unb/services/tais/bot + image: lappis/coach:latest script: - cd bot/ - - make train > /dev/null 2>&1 - make test-stories + +build requirements: + stage: build requirements + image: docker + services: + - docker:dind + script: + - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + - cd ./docker/bot + - ./build-base.sh publish + only: + refs: + - update_pipeline + changes: + - ./docker/bot/requirements.txt + +build coach: + stage: build + image: docker + services: + - docker:dind + script: + - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + - docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest + - docker push lappis/coach:latest only: - - merge_requests + refs: + - update_pipeline + changes: + - ./coach/data build bot: stage: build @@ -47,11 +71,11 @@ build bot: services: - docker:dind script: - - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - - docker build -f docker/bot/bot.Dockerfile -t $BOT_LATEST_IMAGE . - - docker push $BOT_LATEST_IMAGE + - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . + - docker push lappis/bot:latest only: - - master + - update_pipeline build web: stage: build @@ -59,12 +83,11 @@ build web: services: - docker:dind script: - - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - - - docker build -f docker/web/web.Dockerfile -t $WEB_LATEST_IMAGE . - - docker push $WEB_LATEST_IMAGE + - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + - docker build -f docker/web/web.Dockerfile -t lappis/bot-web:latest . + - docker push lappis/bot-web:latest only: - - master + - update_pipeline deploy bot to homolog: stage: deploy diff --git a/scripts/deploy_bot.sh b/scripts/deploy_bot.sh index 4fe0de37..6d532a91 100755 --- a/scripts/deploy_bot.sh +++ b/scripts/deploy_bot.sh @@ -1,9 +1,9 @@ #!/bin/bash sshpass -p $1 ssh -o StrictHostKeyChecking=no root@$2 <<-'ENDSSH' - cd rouana/ - docker-compose -f ./beta.docker-compose.yml stop bot - docker-compose -f ./beta.docker-compose.yml rm -f bot - docker rmi -f registry.gitlab.com/lappis-unb/services/tais/bot - docker-compose -f ./beta.docker-compose.yml up -d bot + cd rouana/ + docker-compose stop bot + docker-compose rm -f bot + docker-compose pull bot + docker-compose up -d bot ENDSSH diff --git a/scripts/deploy_web.sh b/scripts/deploy_web.sh index 529d5649..76cc527f 100755 --- a/scripts/deploy_web.sh +++ b/scripts/deploy_web.sh @@ -2,8 +2,8 @@ sshpass -p $1 ssh -o StrictHostKeyChecking=no root@$2 <<-'ENDSSH' cd rouana/ - docker-compose -f ./beta.docker-compose.yml stop web - docker-compose -f ./beta.docker-compose.yml rm -f web - docker rmi -f registry.gitlab.com/lappis-unb/services/tais/web - docker-compose -f ./beta.docker-compose.yml up -d web + docker-compose stop web + docker-compose rm -f web + docker-compose pull web + docker-compose up -d web ENDSSH From f3e8d8a1f63881ef170932ce943e94ca7dfe4e24 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 6 May 2019 16:54:15 -0300 Subject: [PATCH 2/7] Remove coach from docker-compose --- Makefile | 3 +++ bot/Makefile | 16 ++++++++++------ bot/run-rocketchat.py | 2 +- bot/test_stories.py | 4 ++-- coach/Makefile | 2 +- docker-compose.yml | 18 ++++++------------ docker/bot/bot.Dockerfile | 7 +++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index b6b26806..ce688bd2 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,5 @@ train: docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest + +test-dialogue: + docker-compose run --rm bot make e2e \ No newline at end of file diff --git a/bot/Makefile b/bot/Makefile index 4b9cd85d..84dcc807 100644 --- a/bot/Makefile +++ b/bot/Makefile @@ -1,15 +1,16 @@ run-rocketchat: + make config-bot python3 run-rocketchat.py run-api: - python3 -m rasa_core.run -d models/dialogue -u models/nlu/current --debug \ + python3 -m rasa_core.run -d /models/dialogue -u /models/nlu/current --debug \ --port 5005 --enable_api run-console: - python3 -m rasa_core.run -d models/dialogue -u models/nlu/current --debug + python3 -m rasa_core.run -d /models/dialogue -u /models/nlu/current --debug evaluate: - python3 -m rasa_core.evaluate -d models/dialogue -s data/core/ + python3 -m rasa_core.evaluate -d /models/dialogue -s data/core/ run-validator: python3 validator.py --intents data/intents/ --stories data/stories --domain domain.yml @@ -17,11 +18,14 @@ run-validator: # Force Makefile to execute e2e command every time .PHONY: all e2e clean e2e: - python3 -m rasa_core.evaluate default --core models/dialogue --nlu models/nlu/current --stories e2e/e2e_stories_1.md --e2e - python3 -m rasa_core.evaluate default --core models/dialogue --nlu models/nlu/current --stories e2e/e2e_stories_2.md --e2e + python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_1.md --e2e + python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_2.md --e2e e2e-test: - python3 -m rasa_core.evaluate default --core models/dialogue --nlu models/nlu/current --stories e2e/e2e_stories_erro.md --e2e + python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_erro.md --e2e test-stories: python3 test_stories.py --stories e2e/ --e2e + +config-bot: + python /scripts/bot_config.py -r ${ROCKETCHAT_URL} -an ${ROCKETCHAT_ADMIN_USERNAME} -ap ${ROCKETCHAT_ADMIN_PASSWORD} -bu ${ROCKETCHAT_BOT_USERNAME} -bp ${ROCKETCHAT_BOT_PASSWORD} diff --git a/bot/run-rocketchat.py b/bot/run-rocketchat.py index 18974ab2..58f6ea90 100644 --- a/bot/run-rocketchat.py +++ b/bot/run-rocketchat.py @@ -56,4 +56,4 @@ def run(core_dir, nlu_dir): if __name__ == '__main__': - run('models/dialogue', 'models/nlu/current') + run('/models/dialogue', '/models/nlu/current') diff --git a/bot/test_stories.py b/bot/test_stories.py index 7b0ef2d7..222ce10d 100644 --- a/bot/test_stories.py +++ b/bot/test_stories.py @@ -21,8 +21,8 @@ FAILED_COLOR = utils.bcolors.FAIL BLUE_COLOR = utils.bcolors.OKBLUE BOLD_COLOR = utils.bcolors.BOLD -CORE_DIR = 'models/dialogue' -NLU_DIR = 'models/nlu/current' +CORE_DIR = '/models/dialogue' +NLU_DIR = '/models/nlu/current' parser = argparse.ArgumentParser() diff --git a/coach/Makefile b/coach/Makefile index 0558043c..c5298204 100644 --- a/coach/Makefile +++ b/coach/Makefile @@ -9,7 +9,7 @@ train: train-nlu train-core train-online: python3 -m rasa_core.train -d domain.yml -s data/stories -o \ - models/dialogue --epochs 15 --online --nlu models/nlu/current/ + /src_models/dialogue --epochs 15 --online --nlu /src_models/nlu/current/ run-validator: python3 validator.py --intents data/intents/ --stories data/stories --domain domain.yml diff --git a/docker-compose.yml b/docker-compose.yml index 0dee9b97..587befe9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,24 +32,19 @@ services: context: . dockerfile: ./docker/bot/bot.Dockerfile restart: unless-stopped + command: run-console + # OR + # command: run-rocketchat + # depends_on: + # - rocketchat env_file: - ./docker/bot/bot.env ports: - 5005:5005 volumes: - - models:/bot/models/:ro - ./bot:/bot - ./scripts:/scripts - depends_on: - - coach - - coach: - image: lappis/coach:latest - command: cp -a /src_models/. /models/ - volumes: - - models:/models/ - - ./coach:/coach - - ./scripts:/scripts + # =================================== Web =================================== web: @@ -183,4 +178,3 @@ volumes: esdata: driver: local esbackup: - models: diff --git a/docker/bot/bot.Dockerfile b/docker/bot/bot.Dockerfile index a3bd8691..1c8e0e8f 100644 --- a/docker/bot/bot.Dockerfile +++ b/docker/bot/bot.Dockerfile @@ -1,6 +1,8 @@ +FROM lappis/coach:latest as coach FROM lappis/botrequirements:latest COPY ./bot /bot +COPY --from=coach /src_models/ /models/ COPY ./scripts /scripts WORKDIR /bot @@ -20,7 +22,4 @@ ENV ROCKETCHAT_URL=rocketchat:3000 \ RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf -CMD python /scripts/bot_config.py -r $ROCKETCHAT_URL \ - -an $ROCKETCHAT_ADMIN_USERNAME -ap $ROCKETCHAT_ADMIN_PASSWORD \ - -bu $ROCKETCHAT_BOT_USERNAME -bp $ROCKETCHAT_BOT_PASSWORD \ - && make run-rocketchat +ENTRYPOINT [ "make" ] \ No newline at end of file From fe884b43fe6fb56cc8e60e272f23155586dbdb3e Mon Sep 17 00:00:00 2001 From: Matheus Miranda Date: Mon, 6 May 2019 17:02:23 -0300 Subject: [PATCH 3/7] Update from for 'test stories' job Signed-off-by: Matheus Miranda --- .gitlab-ci.yml | 177 ++++++++++++++++++++------------------ coach/domain.yml | 2 +- docker-compose.yml | 6 +- docker/bot/bot.Dockerfile | 2 - 4 files changed, 99 insertions(+), 88 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c514b1cb..a2c7bb16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,12 @@ image: python:3.6-slim stages: - - test style - - validate format - - test stories - - build requirements - - build +# - test style +# - validate format +# - test stories +# - build requirements +# - build coach +# - build - deploy .set_ssh_config: &set_ssh_config @@ -13,81 +14,93 @@ stages: - apt-get update -y - apt-get install sshpass -y -test style: - stage: test style - script: - - pip -V - - python -V - - pip install -r dev.requirements.txt - - flake8 --exclude venv - -run dataset validator: - stage: validate format - image: lappis/coach:latest - script: - - cd coach/ - - make run-validator - -test stories: - stage: test stories - image: lappis/coach:latest - script: - - cd bot/ - - make test-stories - -build requirements: - stage: build requirements - image: docker - services: - - docker:dind - script: - - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - - cd ./docker/bot - - ./build-base.sh publish - only: - refs: - - update_pipeline - changes: - - ./docker/bot/requirements.txt - -build coach: - stage: build - image: docker - services: - - docker:dind - script: - - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - - docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest - - docker push lappis/coach:latest - only: - refs: - - update_pipeline - changes: - - ./coach/data - -build bot: - stage: build - image: docker - services: - - docker:dind - script: - - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . - - docker push lappis/bot:latest - only: - - update_pipeline - -build web: - stage: build - image: docker - services: - - docker:dind - script: - - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - - docker build -f docker/web/web.Dockerfile -t lappis/bot-web:latest . - - docker push lappis/bot-web:latest - only: - - update_pipeline +#test style: +# stage: test style +# script: +# - pip -V +# - python -V +# - pip install -r dev.requirements.txt +# - flake8 --exclude venv +# +#run dataset validator: +# stage: validate format +# image: lappis/coach:latest +# script: +# - cd coach/ +# - make run-validator +# +#test stories: +# stage: test stories +# image: lappis/bot:latest +# script: +# - cd bot/ +# - make test-stories +# +#build requirements: +# stage: build requirements +# image: docker +# tags: +# - docker +# services: +# - docker:dind +# script: +# - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD +# - cd ./docker/bot +# - ./build-base.sh publish +# only: +# refs: +# - update_pipeline +# changes: +# - ./docker/bot/requirements.txt +# environment: homolog +# +#build coach: +# stage: build coach +# image: docker +# tags: +# - docker +# services: +# - docker:dind +# script: +# - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD +# - docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest +# - docker push lappis/coach:latest +# only: +# refs: +# - update_pipeline +# changes: +# - ./coach/data +# environment: homolog +# +#build bot: +# stage: build +# image: docker +# tags: +# - docker +# services: +# - docker:dind +# script: +# - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD +# - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . +# - docker push lappis/bot:latest +# only: +# - update_pipeline +# environment: homolog +# +#build web: +# stage: build +# image: docker +# tags: +# - docker +# services: +# - docker:dind +# script: +# - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD +# - docker build -f docker/web/web.Dockerfile -t lappis/bot-web:latest . +# - docker push lappis/bot-web:latest +# only: +# - update_pipeline +# environment: homolog deploy bot to homolog: stage: deploy @@ -96,7 +109,7 @@ deploy bot to homolog: script: - ./scripts/deploy_bot.sh $TAIS_SERVER_PASSWORD $TAIS_SERVER_IP only: - - master + - update_pipeline deploy web to homolog: stage: deploy @@ -105,4 +118,4 @@ deploy web to homolog: script: - ./scripts/deploy_web.sh $TAIS_SERVER_PASSWORD $TAIS_SERVER_IP only: - - master + - update_pipeline diff --git a/coach/domain.yml b/coach/domain.yml index 76706ba9..6be3585f 100644 --- a/coach/domain.yml +++ b/coach/domain.yml @@ -111,7 +111,7 @@ templates: - text: A minha missão é te guiar para a inscrição da sua proposta, Se você já sabe isso é porque você já tem um conhecimento avançado e talvez eu não consiga sanar as suas dúvidas. - Mas podemos continuar conversando sobre alguns conceitos básicos da lei Rouanet =) + Mas podemos continuar conversando sobre alguns conceitos básicos da Lei de Incentivo à Cultura =) utter_expressoes_indesejadas: - text: | diff --git a/docker-compose.yml b/docker-compose.yml index 587befe9..6b29fef6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,9 +32,9 @@ services: context: . dockerfile: ./docker/bot/bot.Dockerfile restart: unless-stopped - command: run-console + command: make run-console # OR - # command: run-rocketchat + # command: make run-rocketchat # depends_on: # - rocketchat env_file: @@ -48,7 +48,7 @@ services: # =================================== Web =================================== web: - image: registry.gitlab.com/lappis-unb/services/tais/web + image: lappis/web:latest build: context: . dockerfile: ./docker/web/web.Dockerfile diff --git a/docker/bot/bot.Dockerfile b/docker/bot/bot.Dockerfile index 1c8e0e8f..8e09f236 100644 --- a/docker/bot/bot.Dockerfile +++ b/docker/bot/bot.Dockerfile @@ -21,5 +21,3 @@ ENV ROCKETCHAT_URL=rocketchat:3000 \ ELASTICSEARCH_URL=elasticsearch:9200 RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf - -ENTRYPOINT [ "make" ] \ No newline at end of file From 3c27cdef1a68e375d1b74d84de1ce0bb18205bb6 Mon Sep 17 00:00:00 2001 From: Matheus Miranda Date: Mon, 6 May 2019 17:02:23 -0300 Subject: [PATCH 4/7] Update from for 'test stories' job Signed-off-by: Matheus Miranda --- .gitlab-ci.yml | 26 ++++++++++++++++++++------ coach/domain.yml | 2 +- docker-compose.yml | 10 +++++----- docker/bot/bot.Dockerfile | 2 -- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c514b1cb..84baf00f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ stages: - validate format - test stories - build requirements + - build coach - build - deploy @@ -30,7 +31,7 @@ run dataset validator: test stories: stage: test stories - image: lappis/coach:latest + image: lappis/bot:latest script: - cd bot/ - make test-stories @@ -38,6 +39,8 @@ test stories: build requirements: stage: build requirements image: docker + tags: + - docker services: - docker:dind script: @@ -46,13 +49,16 @@ build requirements: - ./build-base.sh publish only: refs: - - update_pipeline + - master changes: - ./docker/bot/requirements.txt + environment: homolog build coach: - stage: build + stage: build coach image: docker + tags: + - docker services: - docker:dind script: @@ -61,13 +67,16 @@ build coach: - docker push lappis/coach:latest only: refs: - - update_pipeline + - master changes: - ./coach/data + environment: homolog build bot: stage: build image: docker + tags: + - docker services: - docker:dind script: @@ -75,11 +84,14 @@ build bot: - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . - docker push lappis/bot:latest only: - - update_pipeline + - master + environment: homolog build web: stage: build image: docker + tags: + - docker services: - docker:dind script: @@ -87,7 +99,9 @@ build web: - docker build -f docker/web/web.Dockerfile -t lappis/bot-web:latest . - docker push lappis/bot-web:latest only: - - update_pipeline + - master + environment: homolog + deploy bot to homolog: stage: deploy diff --git a/coach/domain.yml b/coach/domain.yml index 76706ba9..6be3585f 100644 --- a/coach/domain.yml +++ b/coach/domain.yml @@ -111,7 +111,7 @@ templates: - text: A minha missão é te guiar para a inscrição da sua proposta, Se você já sabe isso é porque você já tem um conhecimento avançado e talvez eu não consiga sanar as suas dúvidas. - Mas podemos continuar conversando sobre alguns conceitos básicos da lei Rouanet =) + Mas podemos continuar conversando sobre alguns conceitos básicos da Lei de Incentivo à Cultura =) utter_expressoes_indesejadas: - text: | diff --git a/docker-compose.yml b/docker-compose.yml index 587befe9..686d4548 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,11 +32,11 @@ services: context: . dockerfile: ./docker/bot/bot.Dockerfile restart: unless-stopped - command: run-console + command: make run-rocketchat + depends_on: + - rocketchat # OR - # command: run-rocketchat - # depends_on: - # - rocketchat + # command: make run-rocketchat env_file: - ./docker/bot/bot.env ports: @@ -48,7 +48,7 @@ services: # =================================== Web =================================== web: - image: registry.gitlab.com/lappis-unb/services/tais/web + image: lappis/web:latest build: context: . dockerfile: ./docker/web/web.Dockerfile diff --git a/docker/bot/bot.Dockerfile b/docker/bot/bot.Dockerfile index 1c8e0e8f..8e09f236 100644 --- a/docker/bot/bot.Dockerfile +++ b/docker/bot/bot.Dockerfile @@ -21,5 +21,3 @@ ENV ROCKETCHAT_URL=rocketchat:3000 \ ELASTICSEARCH_URL=elasticsearch:9200 RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf - -ENTRYPOINT [ "make" ] \ No newline at end of file From 3e855b31e7698b316c4ba47e98914189a1a40992 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 6 May 2019 18:19:50 -0300 Subject: [PATCH 5/7] Update make train --- Makefile | 1 + docker/bot/bot.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ce688bd2..850daf1e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ train: docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest + docker-compose build bot test-dialogue: docker-compose run --rm bot make e2e \ No newline at end of file diff --git a/docker/bot/bot.Dockerfile b/docker/bot/bot.Dockerfile index 8e09f236..23ab2d12 100644 --- a/docker/bot/bot.Dockerfile +++ b/docker/bot/bot.Dockerfile @@ -1,4 +1,5 @@ FROM lappis/coach:latest as coach + FROM lappis/botrequirements:latest COPY ./bot /bot From b1cb741ec896e4367ec17cbb591b87c4f8558fc5 Mon Sep 17 00:00:00 2001 From: arthurTemporim Date: Wed, 8 May 2019 11:01:44 -0300 Subject: [PATCH 6/7] Change epochs number to 7 Signed-off-by: arthurTemporim --- coach/policy_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coach/policy_config.yml b/coach/policy_config.yml index ba85c4ce..c0168c42 100644 --- a/coach/policy_config.yml +++ b/coach/policy_config.yml @@ -1,6 +1,6 @@ policies: - name: KerasPolicy - epochs: 10 + epochs: 7 batch_size: 10 featurizer: - name: FullDialogueTrackerFeaturizer From 31636ea142b14ca3791911bffe3839be81fe16b1 Mon Sep 17 00:00:00 2001 From: Matheus Miranda Date: Wed, 8 May 2019 11:19:34 -0300 Subject: [PATCH 7/7] Modify deploy to run only on master Signed-off-by: Matheus Miranda --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59c98a00..a21e07d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ deploy bot to homolog: script: - ./scripts/deploy_bot.sh $TAIS_SERVER_PASSWORD $TAIS_SERVER_IP only: - - update_pipeline + - master deploy web to homolog: stage: deploy @@ -118,4 +118,4 @@ deploy web to homolog: script: - ./scripts/deploy_web.sh $TAIS_SERVER_PASSWORD $TAIS_SERVER_IP only: - - update_pipeline + - master