Skip to content

update custom configs, remove rosa and osd #844

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

Merged
openshift-merge-bot merged 4 commits into from
Dec 3, 2025
Merged

update custom configs, remove rosa and osd #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be1c0a0
update custom configs, remove rosa and osd
maschmid Dec 2, 2025
3a7875e
update hypershift configuration
maschmid Dec 3, 2025
2989cbd
try not setting job timeout if <8h
maschmid Dec 3, 2025
91c851b
update tests wrt. ignoring job timeouts <8h
maschmid Dec 3, 2025
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
153 changes: 12 additions & 141 deletions config/serverless-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ config:
disabled: true
repositories:
- customConfigs:
- name: 419-aws-ovn
- name: 420-aws-ovn
releaseBuildConfiguration:
tests:
- as: e2e-aws-ovn-continuous
Expand Down Expand Up @@ -197,12 +197,11 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: openshift-e2e-aws-ovn
timeout: 8h0m0s
zz_generated_metadata:
branch: ""
org: ""
repo: ""
- name: 419-azure
- name: 420-azure
releaseBuildConfiguration:
tests:
- as: e2e-azure-continuous
Expand Down Expand Up @@ -238,12 +237,11 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: openshift-e2e-azure
timeout: 8h0m0s
zz_generated_metadata:
branch: ""
org: ""
repo: ""
- name: 419-gcp
- name: 420-gcp
releaseBuildConfiguration:
tests:
- as: e2e-gcp-continuous
Expand Down Expand Up @@ -279,27 +277,26 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: openshift-e2e-gcp
timeout: 8h0m0s
zz_generated_metadata:
branch: ""
org: ""
repo: ""
- name: 419-hypershift
- name: 420-hypershift
releaseBuildConfiguration:
base_images:
hypershift-operator:
name: "4.19"
namespace: ocp
tag: hypershift-operator
name: hypershift-operator
namespace: hypershift
tag: latest
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
Expand Down Expand Up @@ -340,58 +337,11 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest
timeout: 8h0m0s
zz_generated_metadata:
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
Expand All @@ -409,16 +359,15 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: openshift-e2e-gcp-single-node
timeout: 8h0m0s
zz_generated_metadata:
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:
Expand All @@ -441,83 +390,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:
Expand Down Expand Up @@ -578,7 +450,6 @@ repositories:
cpu: 100m
memory: 200Mi
workflow: firewatch-ipi-aws-cr
timeout: 8h0m0s
zz_generated_metadata:
branch: ""
org: ""
Expand Down
5 changes: 5 additions & 0 deletions pkg/prowgen/prowgen_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 3 additions & 16 deletions pkg/prowgen/prowgen_tests_discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ func TestDiscoverTestsServing(t *testing.T) {
},
Workflow: pointer.String("ipi-aws"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
{
As: "test-e2e",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -223,7 +219,6 @@ func TestDiscoverTestsServing(t *testing.T) {
},
Workflow: pointer.String("ipi-aws"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
{
As: "ui-e2e",
Expand All @@ -249,7 +244,6 @@ func TestDiscoverTestsServing(t *testing.T) {
},
Workflow: pointer.String("ipi-aws"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
}

Expand Down Expand Up @@ -365,7 +359,6 @@ func TestDiscoverTestsServingClusterClaim(t *testing.T) {
},
Workflow: pointer.String("generic-claim"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
}

Expand Down Expand Up @@ -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.*",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -545,7 +535,6 @@ func TestDiscoverTestsEventing(t *testing.T) {
},
Workflow: pointer.String("ipi-aws"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
{
As: "test-e2e",
Expand All @@ -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",
Expand All @@ -596,7 +584,6 @@ func TestDiscoverTestsEventing(t *testing.T) {
},
Workflow: pointer.String("ipi-aws"),
},
Timeout: &prowapi.Duration{Duration: 5 * time.Hour},
},
{
As: "test-reconciler",
Expand All @@ -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",
Expand All @@ -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},
},
}

Expand Down
Loading