diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b4a492a9c732ded028ab33b9b2199fec9aa5aea..0bc7c62441e7f1d35efaa722d517e2fad27afc1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,6 +257,8 @@ build_Docker: stage: build image: ${REGISTRY_PATH}/ci_base_docker:$CI_COMMIT_SHORT_SHA allow_failure: false + rules: + - if: '$CI_COMMIT_BRANCH !~ /Front-End-Only/' script: - pwd - PACKAGE="Docker" # required to create Dockerfiles from the Dockerfile templates @@ -323,6 +325,8 @@ build_lofar_pulp: build_lofar_tbbwriter_control: stage: build + rules: + - if: '$CI_COMMIT_BRANCH !~ /Front-End-Only/' before_script: - *prepare_registry script: diff --git a/SAS/TMSS/deploy/tmss/nginx/default.conf b/SAS/TMSS/deploy/tmss/nginx/default.conf index 302f70e0e8f23bfdd2e667d4ca5b07697f6444e7..0be191b48b9c39f22bdf9d5a957528dff569e525 100644 --- a/SAS/TMSS/deploy/tmss/nginx/default.conf +++ b/SAS/TMSS/deploy/tmss/nginx/default.conf @@ -23,6 +23,15 @@ server { access_log off; } + location /acc/ { + proxy_pass http://monitor.control.lofar:9000/tmss-frontend-web-acceptance/build/; + proxy_set_header Host tmss.lofar.eu; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location @proxy_to_app { proxy_pass http://django;