.gitlab-ci.yml

@@ -21,6 +21,9 @@ variables:
 
 
 include:
+
+  - local: .gitlab/unit-test.gitlab-ci.yml
+
   - project: nofusscomputing/projects/gitlab-ci
     ref: development
     file:
@@ -239,10 +242,31 @@ Docker Container (dev):
     - when: never
 
 
+test:unit:docker:collection:installed:dev:
+  extends: .docker_collection_installed
+  needs: 
+    - "Docker Container (dev)"
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+
+    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+      when: never
+
+    - if:
+        $CI_COMMIT_BRANCH != "master"
+          &&
+        $CI_PIPELINE_SOURCE == "push"
+      when: always
+
+    - when: never
+
+
 Docker Hub (dev):
   extends: .publish-docker-hub
   needs: 
     - "Docker Container (dev)"
+    - "test:unit:docker:collection:installed:dev"
   resource_group: docker-build
   rules:
     - if: $CI_COMMIT_TAG
@@ -255,7 +279,7 @@ Docker Hub (dev):
         $CI_COMMIT_BRANCH == "development"
           &&
         $CI_PIPELINE_SOURCE == "push"
-      when: always
+      when: on_success
 
     - when: never
 
@@ -281,10 +305,31 @@ Docker Container:
     - when: never
 
 
+test:unit:docker:collection:installed:
+  extends: .docker_collection_installed
+  needs:
+    - Docker Container
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: on_success
+
+    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+      when: never
+
+    # - if: # Occur on merge
+    #     $CI_COMMIT_BRANCH == "development"
+    #       &&
+    #     $CI_PIPELINE_SOURCE == "push"
+    #   when: always
+
+    - when: never
+
+
 Docker Hub:
   extends: .publish-docker-hub
   needs: 
     - "Docker Container"
+    - "test:unit:docker:collection:installed"
     - "Gitlab Release"
   resource_group: docker-build
   rules:

.gitlab/unit-test.gitlab-ci.yml

@@ -0,0 +1,33 @@
+
+.docker_collection_installed:
+  stage: test
+  image: 
+    name: nofusscomputing/docker-buildx-qemu:dev
+    pull_policy: always
+  services:
+    - name: docker:23-dind
+      entrypoint: ["env", "-u", "DOCKER_HOST"]
+      command: ["dockerd-entrypoint.sh"]
+  variables:
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
+    DOCKER_DOCKERFILE: dockerfile
+    # See https://github.com/docker-library/docker/pull/166
+    DOCKER_TLS_CERTDIR: ""
+    GIT_STRATEGY: none
+
+  before_script:
+
+    - | # Pull the image
+      docker pull $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
+
+    - | # Show local images
+      docker images;
+
+  script:
+
+    - | # Confirm the package is installed within the docker container
+      docker run \
+        --rm \
+        $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG \
+        ansible-galaxy collection list | grep nofusscomputing.phpipam_scan_agent;