diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml index 934cbf220..2d03d4ccd 100644 --- a/.github/workflows/pre-main.yaml +++ b/.github/workflows/pre-main.yaml @@ -373,7 +373,17 @@ jobs: with: go-version: 1.21.2 + # Prepare collector to be used when running smoke tests + - name: Check out `Collector` + uses: actions/checkout@v4 + with: + repository: test-network-function/collector + path: collector + - name: Deploy collector and mysql + uses: ./collector/.github/actions/prepare-collector-for-use + with: + working_directory: collector # Perform smoke tests using a TNF container. - name: Check out code into the Go module directory @@ -420,16 +430,11 @@ jobs: repository: test-network-function/collector path: collector - - name: Deploy collector and mysql - uses: ./collector/.github/actions/prepare-collector-for-use + - name: Run sanity check on collector + uses: ./collector/.github/actions/run-sanity-check with: working_directory: collector - # - name: Run sanity check on collector - # uses: ./collector/.github/actions/run-sanity-check - # with: - # working_directory: collector - - name: Upload container test results as an artifact uses: actions/upload-artifact@v3 if: always() diff --git a/go.mod b/go.mod index 7cdf3f68f..98831e19f 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require k8s.io/client-go v0.28.3 require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/mittwald/go-helm-client v0.12.3 - github.com/onsi/ginkgo/v2 v2.12.1 + github.com/onsi/ginkgo/v2 v2.13.0 github.com/openshift/api v0.0.1 github.com/openshift/client-go v0.0.1 github.com/operator-framework/api v0.17.7 diff --git a/go.sum b/go.sum index 5739512ba..c4ca47ec4 100644 --- a/go.sum +++ b/go.sum @@ -470,8 +470,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= -github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=