added capability service to gitlab-ci

.gitlab-ci.yml

@@ -47,7 +47,7 @@ check-merge-request:
     rules:
         - if: $GITLAB_TOKEN && $CI_PIPELINE_SOURCE == 'push'
 
-# Build
+# Build Stages
 build dev workflow:
     stage: build-dev
     script:
@@ -61,10 +61,6 @@ build dev workflow:
                 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
-        - echo "$CI_COMMIT_MESSAGE"
-        - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-        - echo $CI_COMMIT_BRANCH
-
     rules:
         - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
           when: always
@@ -79,34 +75,41 @@ build dev workflow:
             - apps/cli/**/*.{py,sh}
             - shared/**/*.{py,sh}
 
-# build dev capability:
-#     stage: build-dev
-#     script:
-#         - docker build -t marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME -f services/capability/Dockerfile.dev .
-#         - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
-#     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/**/*
-#             - apps/cli/**/*.{py,sh}
-#             - shared/**/*.{py,sh}
-
-# Push
+build dev capability:
+    stage: build-dev
+    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/capability:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" -f services/capability/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/capability:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_SHORT_SHA" ; \
+            else
+                echo "Building branch: ${CI_COMMIT_BRANCH}"; \
+                docker build -t marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_BRANCH" -f services/capability/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_BRANCH" marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_SHORT_SHA" ; \
+            fi
+    rules:
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
+          when: always
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+          changes:
+            - .gitlab-ci.yml
+          when: always
+        - if: $GITLAB_TOKEN && $CI_PIPELINE_SOURCE == 'push'
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+          changes:
+            - services/capability/**/*
+            - apps/cli/**/*.{py,sh}
+            - shared/**/*.{py,sh}
+
+# Test Stages
+
+
+# Push Stages
 push dev workflow:
     stage: push-dev
     script:
-        - echo "$CI_COMMIT_MESSAGE"
         - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
-        # - 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_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
         - |
             if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
                 echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
@@ -123,20 +126,45 @@ push dev workflow:
     rules:
         - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
           when: always
-        - if: ($CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == 'push') && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != "development"
+        - if: ($CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == 'push')
+          changes:
+            - .gitlab-ci.yml
+            - services/workflow/**/*
+            - apps/cli/**/*.{py,sh}
+            - shared/**/*.{py,sh}
+          when: manual
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
           when: manual
 
-# push dev capability:
-#     stage: push-dev
-#     script:
-#         - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
-#         - 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
-#         - docker push marconi.aoc.nrao.edu/workspaces/capability:dev
-#     rules:
-#         - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development"'
-#           when: manual
+push dev capability:
+    stage: push-dev
+    script:
+        - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
+        - |
+            if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
+                echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ; \
+                if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "development" ]; then \
+                    docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
+                    docker push marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
+                fi
+            else
+                echo "Pushing branch image to registry: ${CI_COMMIT_BRANCH}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH ; \
+            fi
+        - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+    rules:
+        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+          when: always
+        - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == 'push'
+          changes:
+            - .gitlab-ci.yml
+            - services/capability/**/*
+            - apps/cli/**/*.{py,sh}
+            - shared/**/*.{py,sh}
+          when: manual
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
+          when: manual
 
 # Cleanup
 # clean runner:
@@ -144,15 +172,6 @@ push dev workflow:
 #     script:
 #         - docker images -q --filter=reference="marconi.aoc.nrao.edu/workspaces/*" | xargs docker rmi -f
 
-# Tests
-
-
-# # Deploy
-# deploy dev:
-#     stage: deploy-dev
-#     script:
-#         - docker-compose --version
-#     when: manual
 
 # Deploy
 deploy dev: