Merge branch 'SSA-6730' into 'development'

testing push images on merge again

See merge request ssa/data!4

.gitlab-ci.yml

@@ -35,6 +35,10 @@ build dev workflow:
     rules:
         - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
           when: always
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+          changes:
+            - .gitlab-ci.yml
+          when: always
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
           changes:
             - services/workflow/**/*
@@ -49,6 +53,10 @@ build dev capability:
     rules:
         - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
           when: always
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+          changes:
+            - .gitlab-ci.yml
+          when: always
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
           changes:
             - services/capability/**/*
@@ -64,8 +72,10 @@ 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
-    rules:
-        - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
+    only:
+        - development
+    # rules:
+    #     - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
     # needs: ["build dev workflow"]
 
 push dev capability:
@@ -75,8 +85,10 @@ 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
-    rules:
-        - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
+    only:
+        - development
+    # rules:
+        # - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
     # needs: ["build dev capability"]
 
 # Cleanup