Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e: review CI lanes #1043

Merged
merged 3 commits into from
Oct 15, 2024
Merged

e2e: review CI lanes #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
662e2aa
e2e: install: run tests serially
ffromani Oct 15, 2024
01d5e5a
e2e: uninstall: improve test naming
ffromani Oct 15, 2024
60c6652
hack: don't do cleanup in the e2e flow
ffromani Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions hack/run-test-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set -e
source hack/common.sh

ENABLE_SCHED_TESTS="${ENABLE_SCHED_TESTS:-true}"
ENABLE_CLEANUP="${ENABLE_CLEANUP:-false}"

NO_COLOR=""
if ! which tput &> /dev/null 2>&1 || [[ $(tput -T$TERM colors) -lt 8 ]]; then
Expand Down Expand Up @@ -51,12 +52,16 @@ if [ "$ENABLE_SCHED_TESTS" = true ]; then
# -requireSuite: fail if tests are not executed because of missing suite
${BIN_DIR}/e2e-nrop-sched.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.fail-fast --ginkgo.flake-attempts=2 --ginkgo.junit-report=${REPORT_DIR}/e2e-sched.xml

echo "Running NROScheduler uninstall test suite";
${BIN_DIR}/e2e-nrop-sched-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/sched-uninstall.xml
if [ "$ENABLE_CLEANUP" = true ]; then
echo "Running NROScheduler uninstall test suite";
${BIN_DIR}/e2e-nrop-sched-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/sched-uninstall.xml
fi
fi

echo "Undeploying sample devices for RTE tests"
rte/hack/undeploy-devices.sh
if [ "$ENABLE_CLEANUP" = true ]; then
echo "Undeploying sample devices for RTE tests"
rte/hack/undeploy-devices.sh

echo "Running NRO uninstall test suite";
${BIN_DIR}/e2e-nrop-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/uninstall.xml
echo "Running NRO uninstall test suite";
${BIN_DIR}/e2e-nrop-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/uninstall.xml
fi
3 changes: 3 additions & 0 deletions hack/run-test-install-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ trap '{ echo "Running NRO uninstall test suite"; ${BIN_DIR}/e2e-nrop-uninstall.t
# Run install test suite
echo "Running NRO install test suite"
${BIN_DIR}/e2e-nrop-install.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.fail-fast --ginkgo.junit-report=${REPORT_DIR}/install.xml --ginkgo.focus='\[Install\] durability'

echo "Running NRO uninstall test suite";
${BIN_DIR}/e2e-nrop-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/uninstall.xml
6 changes: 4 additions & 2 deletions test/e2e/install/install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ import (
"github.com/openshift-kni/numaresources-operator/test/utils/objects"
)

// tests here are not interruptible, so they should not accept contexts.
// See: https://onsi.github.io/ginkgo/#interruptible-nodes-and-speccontext

const (
containerNameRTE = "resource-topology-exporter"
)
Expand Down Expand Up @@ -144,7 +147,7 @@ var _ = Describe("[Install] continuousIntegration", func() {
})
})

var _ = Describe("[Install] durability", func() {
var _ = Describe("[Install] durability", Serial, func() {
var initialized bool

BeforeEach(func() {
Expand Down Expand Up @@ -198,7 +201,6 @@ var _ = Describe("[Install] durability", func() {
})

It("[test_id:47587][tier1] should restart RTE DaemonSet when image is updated in NUMAResourcesOperator", func() {

By("getting up-to-date NRO object")
nroKey := client.ObjectKeyFromObject(deployedObj.NroObj)
Expect(nroKey.Name).NotTo(BeEmpty())
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/uninstall/uninstall_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
e2epause "github.com/openshift-kni/numaresources-operator/test/utils/objects/pause"
)

var _ = Describe("[Uninstall]", func() {
var _ = Describe("[Uninstall] clusterCleanup", Serial, func() {
var (
initialized bool
)
Expand Down