Merging latest

.github/workflows/merge.yaml

@@ -12,19 +12,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.15
+      - name: Set up Go 1.17
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.15
+          go-version: 1.17.9
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
       - name: Rebuild mocks
-        run: go get github.com/golang/mock/mockgen && make mocks
+        run: go install github.com/golang/mock/mockgen@v1.6.0 && make mocks
 
       - name: Run Tests
         run: make test
+        env:
+          SHELL: /bin/bash
 
   close_job:
     if: github.event.pull_request.merged == false

.github/workflows/pre-main.yaml

@@ -12,88 +12,137 @@ env:
   IMAGE_NAME: testnetworkfunction/test-network-function
   IMAGE_TAG: unstable
   TNF_CONTAINER_CLIENT: docker
-  TNF_MINIKUBE_ONLY: true
-  TNF_NON_INTRUSIVE_ONLY: true
+  TNF_NON_INTRUSIVE_ONLY: false
   TNF_DISABLE_CONFIG_AUTODISCOVER: false
   TNF_CONFIG_DIR: /tmp/tnf/config
   TNF_OUTPUT_DIR: /tmp/tnf/output
   TNF_SRC_URL: 'https://github.com/${{ github.repository }}'
   TESTING_CMD_PARAMS: '-n host -i ${REGISTRY_LOCAL}/${IMAGE_NAME}:${IMAGE_TAG} -t ${TNF_CONFIG_DIR} -o ${TNF_OUTPUT_DIR}'
+  CONTAINER_DIAGNOSTIC_LOG_LEVEL: trace
+  TNF_PARTNER_DIR: '/usr/tnf-partner'
+  TNF_PARTNER_SRC_DIR: '${TNF_PARTNER_DIR}/src'
+  TERM: xterm-color
 
 jobs:
   lint:
-    name: Run Linter
-    runs-on: ubuntu-20.04
+    name: Run Linter and Vet
+    runs-on: ubuntu-22.04
 
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.17
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.15
+          go-version: 1.17.9
+
+      - name: Disable default go problem matcher
+        run: echo "::remove-matcher owner=go::"
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:
           ref: ${{ github.sha }}
 
       - name: Rebuild mocks
-        run: go get github.com/golang/mock/mockgen && make mocks
-
-      - name: Install golint
-        run: go get golang.org/x/lint/golint
+        run: go install github.com/golang/mock/[email protected] && make mocks
 
-      # TODO: golangci-lint team recommends using a GitHub Action to perform golangci-lint responsibilities.  However,
+      # TODO: golangci-lint team recommends using a GitHub Action to perform golangci-lint responsibilities.  However
       # there does not appear to be a way to honor our existing .golangci.yml.  For now, mimic developer behavior.
       - name: Install golangci-lint
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.39.0
+        run: make install-lint
 
       - name: make lint
         run: make lint
 
+      - name: make vet
+        run: make vet
+
+  yamllint:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: yaml-lint
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          config_data: |
+            extends: default
+            rules:
+              line-length:
+                level: warning
+              trailing-spaces:
+                level: warning
+              brackets:
+                level: warning
+              empty-lines:
+                level: warning
+
   unit-tests:
     name: Run Unit Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.17
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.15
+          go-version: 1.17.9
+
+      - name: Disable default go problem matcher
+        run: echo "::remove-matcher owner=go::"
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:
           ref: ${{ github.sha }}
 
       - name: Rebuild mocks
-        run: go get github.com/golang/mock/mockgen && make mocks
+        run: go install github.com/golang/mock/mockgen@v1.6.0 && make mocks
 
       - name: Run Tests
         run: make test
+        env:
+          SHELL: /bin/bash
+
+      - name: Quality Gate - Test coverage shall be above threshold
+        env:
+          TESTCOVERAGE_THRESHOLD: 50
+        run: |
+          echo "Quality Gate: checking test coverage is above threshold ..."
+          echo "Threshold             : $TESTCOVERAGE_THRESHOLD %"
+          totalCoverage=`UNIT_TEST='true' go tool cover -func=cover.out | grep total | grep -Eo '[0-9]+\.[0-9]+'`
+          echo "Current test coverage : $totalCoverage %"
+          if (( $(echo "$totalCoverage $TESTCOVERAGE_THRESHOLD" | awk '{print ($1 > $2)}') )); then
+              echo "OK"
+          else
+              echo "Current test coverage is below threshold. Please add more unit tests or adjust threshold to a lower value."
+              echo "Failed"
+              exit 1
+          fi
 
   smoke-tests:
     name: Run Smoke Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       SHELL: /bin/bash
       KUBECONFIG: '/home/runner/.kube/config'
 
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.17
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.15
+          go-version: 1.17.9
 
+      - name: Disable default go problem matcher
+        run: echo "::remove-matcher owner=go::"
+
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:
           ref: ${{ github.sha }}
 
       - name: Execute `make mocks`
-        run: go get github.com/golang/mock/mockgen && make mocks
+        run: go install github.com/golang/mock/mockgen@v1.6.0 && make mocks
 
       - name: Install ginkgo
-        run: go get -u github.com/onsi/ginkgo/ginkgo
+        run: go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.3
 
       - name: Execute `make build`
         run: make build
@@ -107,7 +156,9 @@ jobs:
           path: cnf-certification-test-partner
 
       - name: Start the minikube cluster for `local-test-infra`
-        uses: ./cnf-certification-test-partner/.github/actions/start-minikube
+        uses: ./cnf-certification-test-partner/.github/actions/start-k8s-cluster
+        with:
+          working_directory: cnf-certification-test-partner
 
       - name: Create `local-test-infra` OpenShift resources
         uses: ./cnf-certification-test-partner/.github/actions/create-local-test-infra-resources
@@ -116,11 +167,19 @@ jobs:
 
       # Perform smoke tests.
 
-      - name: 'Test: Run diagnostic test suite'
-        run: ./run-cnf-suites.sh diagnostic
-
       - name: 'Test: Run test suites'
-        run: ./run-cnf-suites.sh access-control lifecycle platform observablility networking
+        run: ./run-cnf-suites.sh --focus access-control lifecycle platform observability networking affiliated-certification operator
+
+      - name: Upload smoke test results as an artifact
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: smoke-tests
+          path: |
+            test-network-function/*.xml
+            test-network-function/claim.json
+            test-network-function/claimjson.js
+            test-network-function/results.html
 
       # Perform smoke tests using a TNF container.
 
@@ -140,14 +199,24 @@ jobs:
           cp test-network-function/*.yml $TNF_CONFIG_DIR
         shell: bash
 
-      - name: 'Test: Run diagnostic test suite in a TNF container'
-        run: ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} diagnostic
-
+      - name: 'Test: Run without any TS, just get diagnostic information'
+        run: LOG_LEVEL=${CONTAINER_DIAGNOSTIC_LOG_LEVEL} ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }}
+          
       - name: 'Test: Run generic test suite in a TNF container'
-        run: ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} generic access-control
+        run: ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -f access-control lifecycle platform observability networking affiliated-certification operator
 
-      # Push the new unstable TNF image to Quay.io.
+      - name: Upload container test results as an artifact
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: smoke-tests-container
+          path: |
+            ${{ env.TNF_OUTPUT_DIR }}/*.xml
+            ${{ env.TNF_OUTPUT_DIR }}/claim.json
+            ${{ env.TNF_OUTPUT_DIR }}/claimjson.js
+            ${{ env.TNF_OUTPUT_DIR }}/results.html
 
+      # Push the new unstable TNF image to Quay.io.
       - name: (if on main and upstream) Authenticate against Quay.io
         if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
         uses: docker/login-action@v1