Merge branch 'SSA-6730' into 'development'

testing push when PR is merged

See merge request ssa/data!5

.gitlab-ci.yml

@@ -23,8 +23,9 @@ image: docker:19.03.12
 # services:
 #     - name: docker:19.03.12-dind
 
-# before_script:
-    # - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
+before_script:
+    - echo "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
+    - echo "$CI_COMMIT_REF_NAME"
 
 # Build
 build dev workflow:
@@ -72,10 +73,8 @@ push dev workflow:
         - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
         - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
         - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev
-    only:
-        - development
-    # rules:
-    #     - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development"'
     # needs: ["build dev workflow"]
 
 push dev capability:
@@ -85,10 +84,8 @@ push dev capability:
         - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev
         - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
         - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    only:
-        - development
-    # rules:
-        # - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development"'
     # needs: ["build dev capability"]
 
 # Cleanup