added pushing logic to gitlab-ci

.gitlab-ci.yml

@@ -41,8 +41,8 @@ check-merge-request:
         - 'export OPENED_MR_ON_BRANCH=$(curl --header "Private-Token: $GITLAB_TOKEN" "https://$CI_SERVER_HOST/api/v4/merge_requests?project_id=$CI_PROJECT_ID&source_branch=$CI_COMMIT_BRANCH&state=opened&scope=all")'
         - |
             if [ "${OPENED_MR_ON_BRANCH}" != "[]" ]; then \
-            echo "There is at least one MR opened on branch $CI_COMMIT_BRANCH. Stopping the push pipeline in favor of the merge request pipeline"; \
-            exit 1; \
+                echo "There is at least one MR opened on branch $CI_COMMIT_BRANCH. Stopping the push pipeline in favor of the merge request pipeline"; \
+                exit 1; \
             fi
     rules:
         - if: $GITLAB_TOKEN && $CI_PIPELINE_SOURCE == 'push'
@@ -53,13 +53,13 @@ build dev workflow:
     script:
         - |
             if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
-            echo "Building PR branch: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
-            docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" -f services/workflow/Dockerfile.dev . ; \
-            docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
+                echo "Building PR branch: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
+                docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" -f services/workflow/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
             else
-            echo "Building branch: ${CI_COMMIT_BRANCH}"; \
-            docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" -f services/workflow/Dockerfile.dev . ; \
-            docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
+                echo "Building branch: ${CI_COMMIT_BRANCH}"; \
+                docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" -f services/workflow/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
             fi
     rules:
         - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
@@ -104,18 +104,22 @@ push dev workflow:
         # - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev
         - |
             if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
-            echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
-            docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/workflow:dev ; \
-            docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ; \
-            docker push marconi.aoc.nrao.edu/workspaces/workflow:dev ; \
+                echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ; \
+                if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "development" ]; then \
+                    docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
+                    docker push marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
+                fi
             else
-            echo "Pushing branch image to registry: ${CI_COMMIT_BRANCH}"; \
-            docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH ; \
+                echo "Pushing branch image to registry: ${CI_COMMIT_BRANCH}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH ; \
             fi
         - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
     rules:
-        - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == 'push'
+        - if: ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE !~ /\A(?i)Merge/) || $CI_PIPELINE_SOURCE == 'push'
           when: manual
+        - if: ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/ && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "development")
+          when: always
 
 # push dev capability:
 #     stage: push-dev

shared/channels/setup.py

@@ -7,6 +7,7 @@ from setuptools import setup, find_packages
 VERSION = open('src/channels/_version.py').readlines()[-1].split()[-1].strip("\"'")
 README = Path('README.md').read_text()
 
+# Setup comment
 setup(
     name='ssa-' + Path().absolute().name,
     version=VERSION,