Ssa 6818 enable tests in ci

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
     - build-base
     - push-base
     - build-dev
-    # - unit-test-dev # Commented out until tests are refactored
+    - unit-test-dev
     - push-dev
     - clean-images
     # - deploy-dev
@@ -71,20 +71,24 @@ build dev notification:
 ## Test Stages ##
 
 # Unit Tests
-# hidden job until tests are refactored
-.unit test dev workflow:
+unit test dev workflow:
     stage: unit-test-dev
     variables:
         SERVICE_NAME: "workflow"
     extends: .unit-test
 
-# hidden job until tests are refactored
-.unit test dev capability:
+unit test dev capability:
     stage: unit-test-dev
     variables:
         SERVICE_NAME: "capability"
     extends: .unit-test
 
+unit test dev notification:
+    stage: unit-test-dev
+    variables:
+        SERVICE_NAME: "notification"
+    extends: .unit-test
+
 # Push Stages
 push dev workflow:
     stage: push-dev

Makefile

@@ -30,8 +30,8 @@ alembic-update:
 # Build images from Dockerfile.dev
 .PHONY: docker-dev-images-locally
 docker-dev-images-locally:
-	docker build -t nrao:workflow -f services/workflow/Dockerfile.dev . --build-arg capo-env=docker
-	docker build -t nrao:capability -f services/capability/Dockerfile.dev . --build-arg capo-env=docker
+	docker build -t nrao:workflow -f services/workflow/Dockerfile.dev . --build-arg capo_env=docker
+	docker build -t nrao:capability -f services/capability/Dockerfile.dev . --build-arg capo_env=docker
 
 # Build base image
 .PHONY: docker-base

ci/cleanup.template.yml

@@ -5,7 +5,7 @@
             printf "%s\n" "- Removing Images -" \
             "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${BRANCH_TAG}" \
             "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${CI_COMMIT_SHORT_SHA}"
-        - docker image rm "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${BRANCH_TAG}" "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${CI_COMMIT_SHORT_SHA}"
+        - docker image rm --force "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${BRANCH_TAG}" "${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${CI_COMMIT_SHORT_SHA}"
     rules:
         - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
           when: always

services/capability/Dockerfile.dev

@@ -13,7 +13,7 @@ RUN pip install -r requirements.txt \
     && python setup.py develop
 
 # Set Capo 
-ARG capo-env=dev
-ENV CAPO_PROFILE $capo-env
+ARG capo_env=dev
+ENV CAPO_PROFILE $capo_env
 
 CMD ["pserve", "--reload", "development.ini"]

services/capability/bin/run-tests.sh

@@ -6,7 +6,7 @@
 
 echo "Happy Testing!"
 
-pkgs=($(sed -n "s/\-e .\///p" requirements.txt | tr "\n" " "))
+pkgs=($(sed -n "s|-e ./||p" requirements.txt | tr "\n" " "))
 
 # Install testing requirements
 cd src/test

services/notification/Dockerfile.dev

@@ -4,18 +4,18 @@ FROM marconi.aoc.nrao.edu/ops/base:workspaces
 RUN pip --version
 # Get workflow code into the image
 WORKDIR /code
-COPY ./services/workflow ./
-COPY ./shared ./src/shared
-COPY ./apps/cli ./src/apps/cli
-COPY ./test ./src/test
+COPY ./services/notification ./
+COPY ./shared ./notification/shared
+COPY ./apps/cli ./notification/apps/cli
+COPY ./test ./notification/test
 
 # Python library installation
 RUN pip install -r requirements.txt \
     && python setup.py develop
 
 # Set Capo 
-ARG capo-env=dev
-ENV CAPO_PROFILE $capo-env
+ARG capo_env=dev
+ENV CAPO_PROFILE $capo_env
 
 CMD ["pserve", "--reload", "development.ini"]
 

services/notification/bin/run-tests.sh

+#!/bin/bash
+
+# Set failfast
+# set -e
+# set -o pipefail
+
+echo "Happy Testing!"
+
+pkgs=($(sed -n "s|-e ./||p" requirements.txt | tr "\n" " "))
+
+# Install testing requirements
+cd src/test
+pip install -r requirements.txt
+cd ../..
+
+for pkg in "${pkgs[@]}"
+do
+    printf "\n --- Running: package-tester %s --- \n" $pkg
+    package-tester $pkg
+done
+
+echo "Package Tester has completed."

services/workflow/Dockerfile.dev

@@ -14,8 +14,8 @@ RUN pip install -r requirements.txt \
     && python setup.py develop
 
 # Set Capo 
-ARG capo-env=dev
-ENV CAPO_PROFILE $capo-env
+ARG capo_env=dev
+ENV CAPO_PROFILE $capo_env
 
 CMD ["pserve", "--reload", "development.ini"]
 

services/workflow/bin/run-tests.sh

@@ -6,7 +6,7 @@
 
 echo "Happy Testing!"
 
-pkgs=($(sed -n "s/\-e .\///p" requirements.txt | tr "\n" " "))
+pkgs=($(sed -n "s|-e ./||p" requirements.txt | tr "\n" " "))
 
 # Install testing requirements
 cd src/test