Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .openshift-ci/begin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ fi
if [[ "${JOB_NAME:-}" =~ -ocp- ]]; then
info "Setting worker node type and count for OCP 4 jobs"
set_ci_shared_export WORKER_NODE_COUNT 2
set_ci_shared_export WORKER_NODE_TYPE e2-standard-8
if [[ "${JOB_NAME:-}" =~ vm-scanning ]]; then
set_ci_shared_export WORKER_NODE_TYPE n2-standard-8
else
set_ci_shared_export WORKER_NODE_TYPE e2-standard-8
fi
fi

if [[ "${JOB_NAME:-}" =~ -eks- ]]; then
Expand Down
14 changes: 14 additions & 0 deletions .openshift-ci/ci_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,20 @@ def run(self):
)


class VMScanningE2e(BaseTest):
TEST_TIMEOUT = 2 * 60 * 60
TEST_OUTPUT_DIR = "/tmp/vm-scanning-test-logs"

def run(self):
print("Executing VM scanning e2e tests")

self.run_with_graceful_kill(
["tests/e2e/run-vm-scanning.sh", self.TEST_OUTPUT_DIR],
self.TEST_TIMEOUT,
output_dir=self.TEST_OUTPUT_DIR,
)


class SensorIntegration(BaseTest):
TEST_TIMEOUT = 90 * 60
TEST_OUTPUT_DIR = "/tmp/sensor-integration-test-logs"
Expand Down
6 changes: 4 additions & 2 deletions .openshift-ci/dispatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ ci_export CI_JOB_NAME "$ci_job"

case "$ci_job" in
gke*qa-e2e-tests|gke*nongroovy-e2e-tests|gke*upgrade-tests|gke-ui-e2e-tests|\
eks-qa-e2e-tests|osd*qa-e2e-tests|gke*sensor-integration-tests)
eks-qa-e2e-tests|osd*qa-e2e-tests|gke*sensor-integration-tests|\
ocp*vm-scanning-e2e-tests)
openshift_ci_e2e_mods
;;
*-operator-e2e-tests)
Expand All @@ -40,7 +41,8 @@ case "$ci_job" in
esac

case "$ci_job" in
eks-qa-e2e-tests|osd*qa-e2e-tests|ocp*ui-e2e-tests)
eks-qa-e2e-tests|osd*qa-e2e-tests|ocp*ui-e2e-tests|\
ocp*vm-scanning-e2e-tests)
setup_automation_flavor_e2e_cluster "$ci_job"
;;
esac
Expand Down
Loading
Loading