From be1c0a088a393083c054056e8156bc6931b08224 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Tue, 2 Dec 2025 14:39:08 +0100 Subject: [PATCH 1/4] update custom configs, remove rosa and osd --- config/serverless-operator.yaml | 143 +++----------------------------- 1 file changed, 10 insertions(+), 133 deletions(-) diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml index 32a1d1510..bc6e6066e 100644 --- a/config/serverless-operator.yaml +++ b/config/serverless-operator.yaml @@ -161,7 +161,7 @@ config: disabled: true repositories: - customConfigs: - - name: 419-aws-ovn + - name: 420-aws-ovn releaseBuildConfiguration: tests: - as: e2e-aws-ovn-continuous @@ -202,7 +202,7 @@ repositories: branch: "" org: "" repo: "" - - name: 419-azure + - name: 420-azure releaseBuildConfiguration: tests: - as: e2e-azure-continuous @@ -243,7 +243,7 @@ repositories: branch: "" org: "" repo: "" - - name: 419-gcp + - name: 420-gcp releaseBuildConfiguration: tests: - as: e2e-gcp-continuous @@ -284,22 +284,22 @@ repositories: branch: "" org: "" repo: "" - - name: 419-hypershift + - name: 420-hypershift releaseBuildConfiguration: base_images: hypershift-operator: - name: "4.19" + name: "4.20" namespace: ocp tag: hypershift-operator upi-installer: - name: "4.19" + name: "4.20" namespace: ocp tag: upi-installer releases: latest: integration: include_built_images: true - name: "4.19" + name: "4.20" namespace: ocp tests: - as: e2e-hypershift-continuous @@ -345,53 +345,7 @@ repositories: branch: "" org: "" repo: "" - - name: 419-osd - releaseBuildConfiguration: - base_images: - cli-ocm: - name: cli-ocm - namespace: ci - tag: latest - tests: - - as: e2e-osd-continuous - cron: 31 3 * * 0 - steps: - cluster_profile: osd-ephemeral - env: - CLUSTER_DURATION: "10800" - CLUSTER_VERSION: "4.19" - COMPUTE_NODES: "4" - post: - - chain: gather - - ref: osd-delete-delete - pre: - - ref: ipi-install-rbac - - ref: osd-create-create - test: - - as: operator-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin make test-e2e-with-kafka - from: serverless-source-image - resources: - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 200Mi - - as: knative-serving-eventing-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin make test-upstream-e2e-no-upgrade - from: serverless-source-image - resources: - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 200Mi - timeout: 8h0m0s - zz_generated_metadata: - branch: "" - org: "" - repo: "" - - name: 419-single-node + - name: 420-single-node releaseBuildConfiguration: tests: - as: e2e-sno-continuous @@ -414,11 +368,11 @@ repositories: branch: "" org: "" repo: "" - - name: 419-vsphere + - name: 420-vsphere releaseBuildConfiguration: base_images: upi-installer: - name: "4.19" + name: "4.20" namespace: ocp tag: upi-installer tests: @@ -441,83 +395,6 @@ repositories: branch: "" org: "" repo: "" - - name: ocp4.19-lp-rosa-classic - releaseBuildConfiguration: - base_images: - cli: - name: "4.19" - namespace: ocp - tag: cli - cli-ocm: - name: cli-ocm - namespace: ci - tag: latest - rosa-aws-cli: - name: rosa-aws-cli - namespace: ci - tag: latest - releases: - latest: - integration: - include_built_images: true - name: "4.19" - namespace: ocp - tests: - - as: operator-e2e-rosa-aws - cron: 0 23 31 2 * - steps: - cluster_profile: aws-cspi-qe - env: - CHANNEL_GROUP: candidate - FIREWATCH_CONFIG: | - { - "failure_rules": - [ - {"step": "knative-eventing-kafka-broker-e2e", "failure_type": "test_failure", "classification": "knative-eventing-kafka-broker-e2e Test Failure", "jira_project": "SRVCOM", "jira_additional_labels": ["!default"]}, - {"step": "knative-serving-eventing-e2e", "failure_type": "test_failure", "classification": "knative-serving-eventing-e2e Test Failure", "jira_project": "SRVCOM", "jira_additional_labels": ["!default"]}, - {"step": "operator-e2e", "failure_type": "test_failure", "classification": "operator-e2e Test Failure", "jira_project": "SRVCOM", "jira_additional_labels": ["!default"]}, - {"step": "knative-*", "failure_type": "pod_failure", "classification": "knative Test Execution", "jira_additional_labels": ["!default"]}, - {"step": "operator-e2e", "failure_type": "pod_failure", "classification": "operator-e2e Test Execution", "jira_additional_labels": ["!default"]} - ] - } - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/rosa/lp-interop.json - FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.19-lp","rosa-classic-lp","serverless-lp"]' - FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP - FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" - OCM_LOGIN_ENV: staging - OPENSHIFT_VERSION: "4.19" - test: - - ref: cucushift-installer-check-cluster-health - - as: knative-eventing-kafka-broker-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true - make test-upstream-e2e-kafka-no-upgrade - from: serverless-source-image - resources: - requests: - cpu: 100m - memory: 200Mi - - as: operator-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true - DELETE_CRD_ON_TEARDOWN=false make teardown test-e2e-with-kafka - from: serverless-source-image - resources: - requests: - cpu: 100m - memory: 200Mi - - as: knative-serving-eventing-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true - make test-upstream-e2e-no-upgrade - from: serverless-source-image - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: firewatch-rosa-aws-sts - timeout: 8h0m0s - zz_generated_metadata: - branch: "" - org: "" - repo: "" - name: ocp-4.21-lp-interop-cr releaseBuildConfiguration: tests: From 3a7875e83c3e32ec540b19292ae689273e54add4 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Wed, 3 Dec 2025 10:41:19 +0100 Subject: [PATCH 2/4] update hypershift configuration --- config/serverless-operator.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml index bc6e6066e..f787de98c 100644 --- a/config/serverless-operator.yaml +++ b/config/serverless-operator.yaml @@ -288,9 +288,9 @@ repositories: releaseBuildConfiguration: base_images: hypershift-operator: - name: "4.20" - namespace: ocp - tag: hypershift-operator + name: hypershift-operator + namespace: hypershift + tag: latest upi-installer: name: "4.20" namespace: ocp From 2989cbd0223087c144305e028e143c84457384b6 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Wed, 3 Dec 2025 15:19:29 +0100 Subject: [PATCH 3/4] try not setting job timeout if <8h --- config/serverless-operator.yaml | 6 ------ pkg/prowgen/prowgen_tests.go | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml index f787de98c..82ca1a100 100644 --- a/config/serverless-operator.yaml +++ b/config/serverless-operator.yaml @@ -197,7 +197,6 @@ repositories: cpu: 100m memory: 200Mi workflow: openshift-e2e-aws-ovn - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" @@ -238,7 +237,6 @@ repositories: cpu: 100m memory: 200Mi workflow: openshift-e2e-azure - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" @@ -279,7 +277,6 @@ repositories: cpu: 100m memory: 200Mi workflow: openshift-e2e-gcp - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" @@ -340,7 +337,6 @@ repositories: cpu: 100m memory: 200Mi workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" @@ -363,7 +359,6 @@ repositories: cpu: 100m memory: 200Mi workflow: openshift-e2e-gcp-single-node - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" @@ -455,7 +450,6 @@ repositories: cpu: 100m memory: 200Mi workflow: firewatch-ipi-aws-cr - timeout: 8h0m0s zz_generated_metadata: branch: "" org: "" diff --git a/pkg/prowgen/prowgen_tests.go b/pkg/prowgen/prowgen_tests.go index 79d59e720..fac97c78c 100644 --- a/pkg/prowgen/prowgen_tests.go +++ b/pkg/prowgen/prowgen_tests.go @@ -71,6 +71,11 @@ func DiscoverTests(r Repository, openShift OpenShift, sourceImageName string, sk jobTimeout = test.JobTimeout } + // Per https://issues.redhat.com/browse/DPTP-4603 , we don't set any job-level timeout <8h + if jobTimeout != nil && jobTimeout.Duration < 8*time.Hour { + jobTimeout = nil + } + var ( clusterClaim *cioperatorapi.ClusterClaim clusterProfile cioperatorapi.ClusterProfile From 91c851b0298c82b08071504e32a271738b3f8074 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Wed, 3 Dec 2025 15:44:55 +0100 Subject: [PATCH 4/4] update tests wrt. ignoring job timeouts <8h --- pkg/prowgen/prowgen_tests_discovery_test.go | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkg/prowgen/prowgen_tests_discovery_test.go b/pkg/prowgen/prowgen_tests_discovery_test.go index dff943636..ed863e924 100644 --- a/pkg/prowgen/prowgen_tests_discovery_test.go +++ b/pkg/prowgen/prowgen_tests_discovery_test.go @@ -120,7 +120,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e", @@ -146,7 +145,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e-c", @@ -172,7 +170,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e-tls", @@ -197,7 +194,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e-tls-c", @@ -223,7 +219,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "ui-e2e", @@ -249,7 +244,6 @@ func TestDiscoverTestsServing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, } @@ -365,7 +359,6 @@ func TestDiscoverTestsServingClusterClaim(t *testing.T) { }, Workflow: pointer.String("generic-claim"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, } @@ -412,7 +405,7 @@ func TestDiscoverTestsEventing(t *testing.T) { { Match: "test-reconcile.*", Timeout: &prowapi.Duration{Duration: 2 * time.Hour}, - JobTimeout: &prowapi.Duration{Duration: 4 * time.Hour}, + JobTimeout: &prowapi.Duration{Duration: 10 * time.Hour}, }, { Match: "test-conformance.*", @@ -468,7 +461,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-conformance-c", @@ -494,7 +486,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-conformance-long-long-long-80ea36d", @@ -519,7 +510,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-conformance-long-long-long-80ea36d-c", @@ -545,7 +535,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e", @@ -570,7 +559,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-e2e-c", @@ -596,7 +584,6 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 5 * time.Hour}, }, { As: "test-reconciler", @@ -621,7 +608,7 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 4 * time.Hour}, + Timeout: &prowapi.Duration{Duration: 10 * time.Hour}, }, { As: "test-reconciler-c", @@ -647,7 +634,7 @@ func TestDiscoverTestsEventing(t *testing.T) { }, Workflow: pointer.String("ipi-aws"), }, - Timeout: &prowapi.Duration{Duration: 4 * time.Hour}, + Timeout: &prowapi.Duration{Duration: 10 * time.Hour}, }, }