From f9f3bb90a544431a5df05824f88e5c0512e357b8 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 28 Jun 2023 17:52:33 +0200 Subject: [PATCH] ci: remove `/retest all` command for Jenkins jobs `/retest all` causes a spike in resource consumption in Jenkins and the OpenShift cluster kills the Pod. That means tests are not fully running yet, and results never arrive back in the PR. Instead of `/retest all`, the `ok-to-test` label can be used to trigger required tests with a slight delay between each command. Signed-off-by: Niels de Vos --- jobs/k8s-e2e-external-storage.yaml | 2 +- jobs/mini-e2e.yaml | 4 ++-- jobs/upgrade-tests.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/k8s-e2e-external-storage.yaml b/jobs/k8s-e2e-external-storage.yaml index 3acc8a108..479be6c6c 100644 --- a/jobs/k8s-e2e-external-storage.yaml +++ b/jobs/k8s-e2e-external-storage.yaml @@ -41,7 +41,7 @@ status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/k8s-e2e-external-storage/{k8s_version}' # yamllint disable-line rule:line-length - trigger-phrase: '/(re)?test ((all)|(ci/centos/k8s-e2e-external-storage(/{k8s_version})?))' + trigger-phrase: '/(re)?test ci/centos/k8s-e2e-external-storage(/{k8s_version})?' only-trigger-phrase: '{only_run_on_request}' permit-all: true github-hooks: true diff --git a/jobs/mini-e2e.yaml b/jobs/mini-e2e.yaml index 8e6ca7ee7..bae3ec8d1 100644 --- a/jobs/mini-e2e.yaml +++ b/jobs/mini-e2e.yaml @@ -44,7 +44,7 @@ status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/mini-e2e/k8s-{k8s_version}' # yamllint disable-line rule:line-length - trigger-phrase: '/(re)?test ((all)|(ci/centos/mini-e2e(/k8s-{k8s_version})?))' + trigger-phrase: '/(re)?test ci/centos/mini-e2e(/k8s-{k8s_version})?' only-trigger-phrase: '{only_run_on_request}' permit-all: true github-hooks: true @@ -85,7 +85,7 @@ status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/mini-e2e-helm/k8s-{k8s_version}' # yamllint disable-line rule:line-length - trigger-phrase: '/(re)?test ((all)|(ci/centos/mini-e2e-helm(/k8s-{k8s_version})?))' + trigger-phrase: '/(re)?test (ci/centos/mini-e2e-helm(/k8s-{k8s_version})?' only-trigger-phrase: '{only_run_on_request}' permit-all: true github-hooks: true diff --git a/jobs/upgrade-tests.yaml b/jobs/upgrade-tests.yaml index e463264ce..2886540e4 100644 --- a/jobs/upgrade-tests.yaml +++ b/jobs/upgrade-tests.yaml @@ -52,7 +52,7 @@ status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/upgrade-tests-{test_type}' # yamllint disable-line rule:line-length - trigger-phrase: '/(re)?test ((all)|(ci/centos/upgrade-tests(-{test_type})?))' + trigger-phrase: '/(re)?test ci/centos/upgrade-tests(-{test_type})?' only-trigger-phrase: '{only_run_on_request}' permit-all: true github-hooks: true