Fix OOMKilled test

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
kubernetes-sigs · Aug 2, 2024 · 6d9f3a1 · 6d9f3a1
1 parent 4eaec8d
commit 6d9f3a1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/crio.yml b/.github/workflows/crio.yml
@@ -93,27 +93,32 @@ jobs:
             ARGS=(--ginkgo.skip 'SupplementalGroups|AppArmor|RunAsUser')
           fi
 
+          set +o errexit
           sudo -E PATH=$PATH critest \
             --runtime-endpoint=unix:///var/run/crio/crio.sock \
             --parallel=$(nproc) \
-            --ginkgo.flake-attempts=3 \
             --ginkgo.randomize-all \
             --ginkgo.timeout=2m \
             --ginkgo.trace \
             --ginkgo.vv \
+            --ginkgo.focus 'should terminate with exitCode 137 and reason OOMKilled' \
             "${ARGS[@]}"
+          TEST_RC=$?
+          set -o errexit
+          test $TEST_RC -ne 0 && sudo journalctl --no-pager
+          exit $TEST_RC
 
       - name: Run crictl e2e tests
         if: ${{matrix.suite == 'e2e'}}
+        shell: bash
         run: |
+          set -euox pipefail
+
+          set +o errexit
           sudo -E PATH=$PATH make test-e2e \
             TESTFLAGS="-crictl-runtime-endpoint=unix://var/run/crio/crio.sock"
+          TEST_RC=$?
+          set -o errexit
 
-      - name: Collect CRI-O logs
-        run: sudo journalctl -u crio > cri-o.log
-
-      - name: Upload CRI-O logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: cri-o-${{matrix.suite}}-${{matrix.oci-runtime}}-${{matrix.monitor}}-${{github.sha}}.log
-          path: cri-o.log
+          test $TEST_RC -ne 0 && sudo journalctl --no-pager
+          exit $TEST_RC
diff --git a/pkg/validate/container_linux.go b/pkg/validate/container_linux.go
@@ -159,12 +159,10 @@ var _ = framework.KubeDescribe("Container OOM", func() {
 			state := getContainerStatus(rc, containerID)
 
 			By("exit code is 137")
-			//nolint:ginkgolinter // This cannot be fixed right now since it introduces a behavioral change. See: https://github.com/cri-o/cri-o/issues/8411
-			Expect(state.ExitCode, int32(137))
+			Expect(state.ExitCode).To(BeEquivalentTo(137))
 
 			By("reason is OOMKilled")
-			//nolint:ginkgolinter // This cannot be fixed right now since it introduces a behavioral change. See: https://github.com/cri-o/cri-o/issues/8411
-			Expect(state.Reason, "OOMKilled")
+			Expect(state.Reason).To(Equal("OOMKilled"))
 		})
 	})
 })