remove commit deployments and temporarily add mr deployments

.gitlab-ci.yml

@@ -438,12 +438,15 @@ deploy:
         - sed -i "s/naasc_ENV_secrets:/naasc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
         - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV}
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
-          variables:
-            IMAGE_TAG: $CI_COMMIT_BRANCH
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
           variables:
             IMAGE_TAG: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+            # override DEPLOY_ENV
+            DEPLOY_ENV: "dev"
+            # override DL_HOST
+            DL_HOST: https://dl-dsoc-dev.nrao.edu
+            # override ENV_HOST
+            ENV_HOST: ws-dev.nrao.edu
         - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG