From d020e040c789485c31a42949268079e8924261cd Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Tue, 21 May 2024 16:57:10 -0400 Subject: [PATCH 1/2] label pods under test after waiting for all pods to come up --- run-basic-batch-operators-test.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/run-basic-batch-operators-test.sh b/run-basic-batch-operators-test.sh index 4adc84bac..66cfd8cc8 100755 --- a/run-basic-batch-operators-test.sh +++ b/run-basic-batch-operators-test.sh @@ -452,6 +452,11 @@ while IFS=, read -r package_name catalog; do echo_color "$BLUE" "operator $package_name installed" + echo_color "$BLUE" "Wait to ensure all pods are running" + # Extra wait to ensure that all pods are running + sleep 30 + + echo_color "$BLUE" "Label deployments, statefulsets, pods" # Label deployments, statefulsets and pods with "test-network-function.com/generic=target" { oc get deployment -n "$ns" -o custom-columns=':.metadata.name,:.metadata.namespace,:.kind' | sed '/^ *$/d' | awk '{print " oc label " $3 " -n " $2 " " $1 " test-network-function.com/generic=target "}' | bash || true @@ -459,10 +464,6 @@ while IFS=, read -r package_name catalog; do oc get pods -n "$ns" -o custom-columns=':.metadata.name,:.metadata.namespace,:.kind' | sed '/^ *$/d' | awk '{print " oc label " $3 " -n " $2 " " $1 " test-network-function.com/generic=target "}' | bash || true } >>"$LOG_FILE_PATH" 2>&1 - echo_color "$BLUE" "Wait to ensure all pods are running" - # Extra wait to ensure that all pods are running - sleep 30 - # run tnf-container echo_color "$BLUE" "run CNF suite" TNF_LOG_LEVEL=trace ./run-tnf-container.sh -k "$KUBECONFIG" -t "$report_dir" -o "$report_dir" -c "$DOCKER_CONFIG" -l all >>"$LOG_FILE_PATH" 2>&1 || { From ae1a4a7e7fb711eb2a275e0d8b1e8589fd02d73d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:44:16 +0000 Subject: [PATCH 2/2] Bump docker/login-action from 3.1.0 to 3.3.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/e92390c5fb421da1463c202d546fed0ec5c39f20...9780b0c442fbb1117ed29e0efdff1e18412f7567) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pre-main.yaml | 2 +- .github/workflows/tnf-image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml index 6c559ed83..9f2cd1173 100644 --- a/.github/workflows/pre-main.yaml +++ b/.github/workflows/pre-main.yaml @@ -501,7 +501,7 @@ jobs: uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Login to Quay.io - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }} with: registry: ${{ env.REGISTRY }} diff --git a/.github/workflows/tnf-image.yaml b/.github/workflows/tnf-image.yaml index b5e28adcd..1adf9d7d8 100644 --- a/.github/workflows/tnf-image.yaml +++ b/.github/workflows/tnf-image.yaml @@ -125,7 +125,7 @@ jobs: # Push the new TNF image to Quay.io. - name: Authenticate against Quay.io - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: registry: ${{ env.REGISTRY }} # Use a Robot Account to authenticate against Quay.io