Skip to content

Commit

Permalink
Merge master into rds-core
Browse files Browse the repository at this point in the history
Signed-off-by: Vishnu Challa <vchalla@vchalla-thinkpadp1gen2.rmtusnc.csb>
  • Loading branch information
Vishnu Challa committed Feb 28, 2025
2 parents 2164e37 + eb9cfdf commit b42db0a
Show file tree
Hide file tree
Showing 771 changed files with 25,425 additions and 14,624 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/auto-merge-dispatcher-prs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Auto Merge dispatcher PR

permissions: write-all

on:
pull_request:
types: [opened, edited, reopened, synchronize]

jobs:
auto-merge:
if: ${{ startsWith(github.event.pull_request.title, 'Automate prow job dispatcher at') && github.event.pull_request.user.login == 'openshift-bot' }}
runs-on: ubuntu-latest
steps:
- name: Merge PR
uses: actions/github-script@v6
env:
GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }}
with:
script: |
const prNumber = context.payload.pull_request.number;
console.log(`Attempting to merge PR #${prNumber}...`);
try {
const mergeResponse = await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
merge_method: "squash"
});
console.log('Merge successful:', mergeResponse.data);
} catch (error) {
console.error('Failed to merge PR:', error);
throw error;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,6 @@ resources:
cpu: 100m
memory: 200Mi
tests:
- as: service-registry-2-6-fips
cron: 0 23 31 2 *
steps:
cluster_profile: aws-cspi-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
FIPS_ENABLED: "true"
FIREWATCH_CONFIG: |
{
"failure_rules":
[
{"step": "service-registry-run-tests", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "service-registry-run-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "APICURQE", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]}
]
}
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.18-lp","self-managed-lp","service-registry-lp","fips"]'
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: rkubis@redhat.com
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
USER_TAGS: |
scenario service-registry
test:
- ref: service-registry-run-tests
workflow: firewatch-ipi-aws
timeout: 4h0m0s
- as: service-registry-2-6
cron: 0 23 31 2 *
steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
base_images:
cli:
name: "4.19"
namespace: ocp
tag: cli
os:
name: ubi
namespace: ocp
tag: "8"
test-image:
name: apicurio-ci-tools
namespace: ci
tag: interop
releases:
latest:
candidate:
product: ocp
stream: nightly
version: "4.19"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: service-registry-2-6-fips
cron: 0 23 31 2 *
steps:
cluster_profile: aws-cspi-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
FIPS_ENABLED: "true"
FIREWATCH_CONFIG: |
{
"failure_rules":
[
{"step": "service-registry-run-tests", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "service-registry-run-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "APICURQE", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]}
]
}
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.19-lp","self-managed-lp","service-registry-lp","fips"]'
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: rkubis@redhat.com
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
USER_TAGS: |
scenario service-registry
test:
- ref: service-registry-run-tests
workflow: firewatch-ipi-aws
timeout: 4h0m0s
- as: service-registry-2-6
cron: 0 23 31 2 *
steps:
cluster_profile: aws-cspi-qe
env:
BASE_DOMAIN: cspilp.interop.ccitredhat.com
FIREWATCH_CONFIG: |
{
"failure_rules":
[
{"step": "service-registry-run-tests", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
{"step": "service-registry-run-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "APICURQE", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]}
]
}
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.19-lp","self-managed-lp","service-registry-lp"]'
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: rkubis@redhat.com
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
USER_TAGS: |
scenario service-registry
test:
- ref: service-registry-run-tests
workflow: firewatch-ipi-aws
timeout: 4h0m0s
zz_generated_metadata:
branch: main
org: Apicurio
repo: apicurio-registry-system-tests
variant: service-registry-ocp4.19-lp-interop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,52 @@ tests:
test:
- ref: cloud-bulldozer-e2e-benchmarking-cluster-density-v2
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-cluster-density-ms-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-cluster-density-ms
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-crd-scale-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-crd-scale
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-node-density-heavy-single-node
steps:
Expand Down Expand Up @@ -211,6 +257,126 @@ tests:
test:
- ref: cloud-bulldozer-e2e-benchmarking-network-policy
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-networkpolicy-matchexpressions-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
LOKI_USE_SERVICEMONITOR: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-networkpolicy-matchexpressions
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-networkpolicy-matchlabels-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
LOKI_USE_SERVICEMONITOR: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-networkpolicy-matchlabels
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-networkpolicy-multitenant-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
LOKI_USE_SERVICEMONITOR: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-networkpolicy-multitenant
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-pvc-density-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
LOKI_USE_SERVICEMONITOR: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-pvc-density
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-whereabouts-single-node
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "1"
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
IF_INSTALL_INFRA_WORKLOAD: "false"
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
LOKI_USE_SERVICEMONITOR: "false"
OCP_ARCH: arm64
SPOT_INSTANCES: "true"
USER_TAGS: |
TicketId 382
test:
- ref: cloud-bulldozer-e2e-benchmarking-whereabouts
workflow: openshift-qe-installer-aws
- always_run: false
as: e2e-router-perf-single-node
steps:
Expand Down
Loading

0 comments on commit b42db0a

Please sign in to comment.