diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24f559c0c04b6713cdc55a0a8a4e0a0a6cc68cb6..23f68e29b1de4fd3902c8939c46bdcf5ca45680e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,6 @@ stages: - deploy -deploy-lcr: - tags: - - docker - stage: deploy - image: registry.esss.lu.se/ics-docker/tower-cli:3.3 - script: - - > - tower-cli job launch - -h torn.tn.esss.lu.se - -t ${TOWER_OAUTH_TOKEN} - -J "deploy-cs-studio@lcr" - --tags csstudio-ess-opis - -e "csstudio_ess_opis_version=$CI_COMMIT_REF_NAME" --monitor - only: - - master@ics-software/ess-opis - deploy-nx: tags: - docker diff --git a/README.md b/README.md index 957bfbbaa4695f2c9f38983cca197b71c51cab07..e72b088aa2511ab313e09f4c8edea973f2cdbee0 100644 --- a/README.md +++ b/README.md @@ -176,6 +176,9 @@ this readme file will be updated accordingly. The ess-opis repository is cloned and mounted in CS-Studio by the [Ansible role](https://gitlab.esss.lu.se/ics-ansible-galaxy/ics-ans-role-cs-studio) used to deploy CS-Studio. -Every time a push is done on the master branch, it triggers an Ansible job via -AWX API to update the git repository on the LCR workstations. Refer to the -`.gitlab-ci.yml` file for the implementation. + +Automatic update to the LCR has been disabled to prevent unwanted changes. +Deployment is done from AWX using the "deploy-cs-studio-opis" template. + +Deployment to the nxbastion machine is still automatic when pushing to the master branch. +Refer to the `.gitlab-ci.yml` file for the implementation.