Skip to content

Commit

Permalink
Merge branch 'openshift:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
cs-zhang committed Apr 9, 2024
2 parents 08cc5f0 + d460da8 commit 45f90ec
Show file tree
Hide file tree
Showing 1,182 changed files with 21,242 additions and 27,151 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ release-controllers: update_crt_crd
./hack/generators/release-controllers/generate-release-controllers.py .

checkconfig:
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" gcr.io/k8s-prow/checkconfig:v20240327-a58d781f5a --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" gcr.io/k8s-prow/checkconfig:v20240405-c76de01869 --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient

jobs: ci-operator-checkconfig
$(MAKE) ci-operator-prowgen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure Provisioning - Cluster", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ tests:
cluster_profile: aws-managed-cspi-qe
env:
ADDONS_OPERATORS_RUN_IN_PARALLEL: "false"
AWS_REGION: us-east-1
CLUSTER_NAME_PREFIX: rhoai
CLUSTER1_CONFIG: platform=rosa;region=us-east-2;version=4.14;channel-group=stable;compute-machine-type=g4dn.2xlarge;timeout=2h;replicas=2;fips=true;ocm-env=stage
CLUSTER1_CONFIG: platform=rosa;region=us-west-2;version=4.14;channel-group=stable;compute-machine-type=g4dn.2xlarge;timeout=2h;replicas=2;fips=true;ocm-env=stage
FIREWATCH_CONFIG: |
{
"failure_rules":
Expand All @@ -59,6 +60,7 @@ tests:
OPERATOR6_CONFIG: name=rhods-operator;namespace=redhat-ods-operator
PULL_SECRET_NAME: pull-secret
S3_BUCKET_NAME: openshift-cli-installer
S3_BUCKET_OPERATORS_LATEST_IIB_PATH: ci-iib-jobs-trigger/operators-latest-iib.json
S3_BUCKET_PATH: openshift-ci
test:
- ref: rhoai-tests
Expand All @@ -68,6 +70,7 @@ tests:
cluster_profile: aws-managed-cspi-qe
env:
ADDONS_OPERATORS_RUN_IN_PARALLEL: "false"
AWS_REGION: us-east-1
CLUSTER_NAME_PREFIX: rhoai
CLUSTER1_CONFIG: platform=gcp-osd;region=us-west1;version=4.14;channel-group=stable;compute-machine-type=custom-8-32768;timeout=2h;replicas=2;fips=true;ocm-env=stage
FIREWATCH_CONFIG: |
Expand All @@ -94,6 +97,7 @@ tests:
OPERATOR6_CONFIG: name=rhods-operator;namespace=redhat-ods-operator
PULL_SECRET_NAME: pull-secret
S3_BUCKET_NAME: openshift-cli-installer
S3_BUCKET_OPERATORS_LATEST_IIB_PATH: ci-iib-jobs-trigger/operators-latest-iib.json
S3_BUCKET_PATH: openshift-ci
test:
- ref: rhoai-tests
Expand All @@ -103,6 +107,7 @@ tests:
cluster_profile: aws-managed-cspi-qe
env:
ADDONS_OPERATORS_RUN_IN_PARALLEL: "false"
AWS_REGION: us-east-1
CLUSTER_NAME_PREFIX: rhoai
CLUSTER1_CONFIG: platform=aws-osd;region=us-east-2;version=4.14;channel-group=stable;compute-machine-type=g4dn.2xlarge;timeout=2h;replicas=2;fips=true;ocm-env=stage
FIREWATCH_CONFIG: |
Expand All @@ -128,6 +133,7 @@ tests:
OPERATOR6_CONFIG: name=rhods-operator;namespace=redhat-ods-operator
PULL_SECRET_NAME: pull-secret
S3_BUCKET_NAME: openshift-cli-installer
S3_BUCKET_OPERATORS_LATEST_IIB_PATH: ci-iib-jobs-trigger/operators-latest-iib.json
S3_BUCKET_PATH: openshift-ci
test:
- ref: rhoai-tests
Expand All @@ -137,6 +143,7 @@ tests:
cluster_profile: aws-managed-cspi-qe
env:
ADDONS_OPERATORS_RUN_IN_PARALLEL: "false"
AWS_REGION: us-east-1
CLUSTER_NAME_PREFIX: rhoai
CLUSTER1_CONFIG: base-domain=aws.interop.ccitredhat.com;platform=aws;region=us-east-2;version=4.14;stream=stable;worker-flavor=g4dn.2xlarge;timeout=2h;worker-replicas=2;fips=true;ocm-env=stage
FIREWATCH_CONFIG: |
Expand All @@ -162,6 +169,7 @@ tests:
OPERATOR6_CONFIG: name=rhods-operator;namespace=redhat-ods-operator
PULL_SECRET_NAME: pull-secret
S3_BUCKET_NAME: openshift-cli-installer
S3_BUCKET_OPERATORS_LATEST_IIB_PATH: ci-iib-jobs-trigger/operators-latest-iib.json
S3_BUCKET_PATH: openshift-ci
test:
- ref: rhoai-tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ tests:
steps:
cluster_profile: aws-managed-cspi-qe
env:
AWS_REGION: us-east-1
CLUSTER_NAME_PREFIX: rhoai
CLUSTER1_CONFIG: platform=hypershift;region=us-east-2;version=4.14;channel-group=stable;compute-machine-type=m5.4xlarge;timeout=90m;replicas=6;fips=false;ocm-env=stage
FIREWATCH_CONFIG: |
Expand All @@ -57,6 +58,7 @@ tests:
INSTALL_FROM_IIB: "true"
OPERATOR1_CONFIG: name=rhods-operator;namespace=redhat-ods-operator
S3_BUCKET_NAME: openshift-cli-installer
S3_BUCKET_OPERATORS_LATEST_IIB_PATH: ci-iib-jobs-trigger/operators-latest-iib.json
S3_BUCKET_PATH: openshift-ci
test:
- ref: rhoai-tests
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/config/Prucek/release/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ approvers:
- hongkailiu
- jmguzik
- jupierce
- prucek
- psalajova
- smg247
- toma5od
Expand All @@ -23,6 +24,7 @@ reviewers:
- droslean
- hongkailiu
- jmguzik
- prucek
- psalajova
- smg247
- toma5od
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ resources:
memory: 200Mi
tests:
- as: cnv-odf-tests-aws-upi-ocp414
cron: 0 6 25 10 *
cron: 4 14 * * 6
steps:
cluster_profile: aws-cspi-qe
cluster_profile: aws-interop-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
BASE_DOMAIN: release-ci.cnv-qe.rhood.us
COMPUTE_NODE_TYPE: c5n.metal
FIREWATCH_CONFIG: |
{
Expand Down Expand Up @@ -74,4 +74,4 @@ zz_generated_metadata:
branch: cnv-4.14
org: RedHatQE
repo: interop-testing
variant: cnv-odf-ocp4.14-lp-interop
variant: ocp-cnv-odf-4.14
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ resources:
memory: 200Mi
tests:
- as: cnv-odf-tests-aws-upi-ocp415
cron: 0 6 25 10 *
cron: 4 15 * * 6
steps:
cluster_profile: aws-cspi-qe
cluster_profile: aws-interop-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
BASE_DOMAIN: release-ci.cnv-qe.rhood.us
COMPUTE_NODE_TYPE: c5n.metal
FIREWATCH_CONFIG: |
{
Expand Down Expand Up @@ -78,4 +78,4 @@ zz_generated_metadata:
branch: cnv-4.15
org: RedHatQE
repo: interop-testing
variant: cnv-odf-ocp4.15-lp-interop
variant: ocp-cnv-odf-4.15
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ resources:
memory: 200Mi
tests:
- as: cnv-odf-tests-aws-upi-ocp416
cron: 0 6 11 2 *
cron: 4 16 * * 6
steps:
cluster_profile: aws-cspi-qe
cluster_profile: aws-interop-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
BASE_DOMAIN: release-ci.cnv-qe.rhood.us
COMPUTE_NODE_TYPE: c5n.metal
FIREWATCH_CONFIG: |
{
Expand Down Expand Up @@ -70,7 +70,7 @@ tests:
OCP_VERSION: "4.16"
ODF_OPERATOR_CHANNEL: stable-4.15
ODF_VERSION_MAJOR_MINOR: "4.15"
RE_TRIGGER_ON_FAILURE: "true"
RE_TRIGGER_ON_FAILURE: "false"
USER_TAGS: |
scenario cnv
test:
Expand All @@ -84,4 +84,4 @@ zz_generated_metadata:
branch: cnv-4.16
org: RedHatQE
repo: interop-testing
variant: cnv-odf-ocp4.16-lp-interop
variant: ocp-cnv-odf-4.16
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ images:
to: log-file-metric-exporter
promotion:
to:
- name: 5.y
- name: 6.y
namespace: logging
releases:
latest:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
base_images:
ubi9-minimal:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.20-openshift-4.14
images:
- from: ubi9-minimal
to: log-file-metric-exporter
promotion:
to:
- name: "5.9"
namespace: logging
releases:
latest:
candidate:
product: ocp
stream: ci
version: "4.14"
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: test
commands: make test
container:
from: src
timeout: 10m0s
zz_generated_metadata:
branch: release-5.9
org: ViaQ
repo: log-file-metric-exporter
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure Provisioning - Cluster", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
Expand Down
9 changes: 9 additions & 0 deletions ci-operator/config/crc-org/crc/crc-org-crc-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ tests:
steps:
cluster_profile: osl-gcp
workflow: code-ready-crc-microshift
- as: security
optional: true
steps:
cluster_profile: osl-gcp
env:
ORG_NAME: developer-red-hat-openshift-local
PROJECT_NAME: crc
SNYK_TOKEN_PATH: /var/run/secrets/ci.openshift.io/cluster-profile/snyk-token
workflow: openshift-ci-security
zz_generated_metadata:
branch: main
org: crc-org
Expand Down
47 changes: 47 additions & 0 deletions ci-operator/config/crc-org/snc/crc-org-snc-release-4.16.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
base_images:
base:
name: "4.8"
namespace: ocp
tag: base
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.15
images:
- dockerfile_path: images/openshift-ci/Dockerfile
from: base
to: snc
releases:
initial:
integration:
name: "4.8"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.8"
namespace: ocp
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
crc:
requests:
cpu: "3"
memory: 5Gi
tests:
- as: e2e-snc
steps:
cluster_profile: gcp
workflow: code-ready-snc-e2e
- as: e2e-microshift
cluster: build01
steps:
cluster_profile: gcp
workflow: code-ready-snc-microshift
zz_generated_metadata:
branch: release-4.16
org: crc-org
repo: snc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure Provisioning - Cluster", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tests:
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default", "interop-tests"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default", "interop-tests"]},
{"step": "eap-pit-74-execute-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "JBEAP", "group": {"name": "lp-tests", "priority": 2}, "jira_additional_labels": ["!default", "interop-tests"]},
{"step": "eap-pit-74-execute-tests", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 2}, "jira_additional_labels": ["!default", "interop-tests"]}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure Provisioning - Cluster", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure provisioning", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators-*", "failure_type": "pod_failure", "classification": "operator install", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "install-operators-*", "failure_type": "test_failure", "classification": "operator install", "jira_project": "TRACING", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "install-operators*", "failure_type": "pod_failure", "classification": "operator install", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "install-operators*", "failure_type": "test_failure", "classification": "operator install", "jira_project": "TRACING", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "jboss-web-server-lp-interop-tests-*", "failure_type": "pod_failure", "classification": "test failure", "group": {"name": "lp-tests", "priority": 2}, "jira_additional_labels": ["!default","interop-tests"]},
Expand All @@ -50,6 +50,7 @@ tests:
[
{"name": "jws-operator", "source": "redhat-operators", "channel": "alpha", "install_namespace": "openshift-operators", "target_namespaces": ""}
]
RE_TRIGGER_ON_FAILURE: "true"
USER_TAGS: |
scenario jws
test:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
"failure_rules":
[
{"step": "ipi-*", "failure_type": "all", "classification": "Infrastructure Provisioning - Cluster", "group": {"name": "cluster", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "install-operators*", "failure_type": "all", "classification": "Infrastructure Provisioning - Operators", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "pod_failure", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
{"step": "gather-*", "failure_type": "test_failure", "classification": "NONE", "jira_project": "NONE", "ignore": "true"},
{"step": "openshift-*", "failure_type": "all", "classification": "Other", "group": {"name": "cluster", "priority": 2}, "jira_additional_labels": ["!default"]},
Expand Down

0 comments on commit 45f90ec

Please sign in to comment.