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 2, 2024
2 parents f4c04d1 + 05f1fb5 commit 226d6b9
Show file tree
Hide file tree
Showing 11,250 changed files with 56,286 additions and 51,450 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ base_images:
name: ocs-ci-container
namespace: ci
tag: stable
openshift-virtualization-tests:
name: openshift-virtualization-tests
namespace: ci
tag: latest
build_root:
image_stream_tag:
name: release
Expand Down Expand Up @@ -74,6 +78,7 @@ tests:
- ref: interop-tests-deploy-odf
- ref: interop-tests-ocs-tests
- ref: interop-tests-cnv-tests-e2e-deploy
- ref: interop-tests-openshift-virtualization-tests
workflow: firewatch-ipi-aws
zz_generated_metadata:
branch: cnv-4.16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ tests:
- as: push-images
cli: latest
commands: |
export QUAY_PASS=$(cat /maistra-secrets/password)
export QUAY_PASS=$(cat /quay-secret/password)
oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
entrypoint \
sh -c \
Expand All @@ -144,8 +144,8 @@ tests:
IMAGE=quay.io/maistra-dev/istio-ubi9-operator:PR-${PULL_NUMBER}"
oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
credentials:
- mount_path: /maistra-secrets
name: maistra-dev-prow
- mount_path: /quay-secret
name: quay-pass
namespace: test-credentials
env:
- name: MAISTRA_NAMESPACE
Expand Down Expand Up @@ -356,10 +356,6 @@ tests:
export BUILD_WITH_CONTAINER="0" && \
make test.e2e.kind"
oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
credentials:
- mount_path: /maistra-secrets
name: maistra-dev-prow
namespace: test-credentials
env:
- name: MAISTRA_NAMESPACE
- name: MAISTRA_SC_POD
Expand Down Expand Up @@ -451,7 +447,7 @@ tests:
- as: build
cli: latest
commands: |
export QUAY_PASS=$(cat /maistra-secrets/password)
export QUAY_PASS=$(cat /quay-secret/password)
export GITHUB_TOKEN=$(cat /creds-github/token)
# login to quay.io in the privileged pod
oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
Expand All @@ -468,8 +464,8 @@ tests:
make -e GITHUB_TOKEN=${GITHUB_TOKEN} -e NIGHTLY=true docker-buildx bundle-publish-nightly"
oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
credentials:
- mount_path: /maistra-secrets
name: maistra-dev-prow
- mount_path: /quay-secret
name: quay-pass
namespace: test-credentials
- mount_path: /creds-github
name: workflow-github
Expand Down
23 changes: 23 additions & 0 deletions ci-operator/config/migtools/oadp-non-admin/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
# Fetched from https://github.com/migtools/oadp-non-admin root OWNERS
# If the repo had OWNERS_ALIASES then the aliases were expanded
# Logins who are not members of 'openshift' organization were filtered out
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md

approvers:
- kaovilai
- mateusoliveira43
- mpryc
- mrnold
- rayfordj
- shawn-hurley
- shubham-pampattiwar
- sseago
options: {}
reviewers:
- kaovilai
- mateusoliveira43
- mpryc
- mrnold
- shubham-pampattiwar
- sseago
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
build_root:
image_stream_tag:
name: builder
namespace: ocp
tag: rhel-8-golang-1.20-openshift-4.14
images:
- dockerfile_path: Dockerfile
to: oadp-non-admin
promotion:
to:
- name: oadp-non-admin
namespace: konveyor
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
zz_generated_metadata:
branch: master
org: migtools
repo: oadp-non-admin
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.18
tag: golang-1.19
images:
- build_args:
- name: MANIFEST_RELEASE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.18
tag: golang-1.19
images:
- build_args:
- name: MANIFEST_RELEASE
Expand Down
23 changes: 18 additions & 5 deletions ci-operator/config/opendatahub-io/openvino_model_server/OWNERS
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
# Fetched from https://github.com/opendatahub-io/openvino_model_server root OWNERS
# If the repo had OWNERS_ALIASES then the aliases were expanded
# Logins who are not members of 'openshift' organization were filtered out
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md

approvers:
- anishasthana
- danielezonca
- dtrifiro
- heyselbi
- israel-hdez
- jooho
- spolti
- terrytangyuan
- vaibhavjainwiz
- vedantmahabaleshwarkar
- xaenalt
options: {}
reviewers:
- anishasthana
- danielezonca
- jooho
- xaenalt
- dtrifiro
- heyselbi
- terrytangyuan
- vaibhavjainwiz
- xaenalt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,73 @@ promotion:
to:
- additional_images:
eventing-hyperfoil-benchmark-src: src
name: main
namespace: openshift
tag: main
releases:
latest:
candidate:
product: ocp
stream: nightly
version: "4.16"
release:
channel: fast
version: "4.14"
resources:
'*':
requests:
cpu: 500m
memory: 1Gi
tests:
- as: test-kafka-broker-namesp-8045b51-aws-416
- as: test-kafka-broker-midstr-a0cb886-aws-414
steps:
allow_best_effort_post_steps: true
allow_skip_on_success: true
cluster_profile: aws-serverless
env:
BASE_DOMAIN: serverless.devcluster.openshift.com
post:
- as: knative-must-gather
best_effort: true
cli: latest
commands: oc adm must-gather --image=quay.io/openshift-knative/must-gather --dest-dir
"${ARTIFACT_DIR}/gather-knative"
from: src
optional_on_success: true
resources:
requests:
cpu: 100m
timeout: 20m0s
- as: openshift-must-gather
best_effort: true
cli: latest
commands: oc adm must-gather --dest-dir "${ARTIFACT_DIR}/gather-openshift"
from: src
optional_on_success: true
resources:
requests:
cpu: 100m
timeout: 20m0s
- as: openshift-gather-extra
best_effort: true
cli: latest
commands: curl -skSL https://raw.githubusercontent.com/openshift/release/master/ci-operator/step-registry/gather/extra/gather-extra-commands.sh
| /bin/bash -s
from: src
grace_period: 1m0s
optional_on_success: true
resources:
requests:
cpu: 300m
memory: 300Mi
timeout: 20m0s
- ref: ipi-deprovision-deprovision
test:
- as: test
cli: latest
commands: SKIP_MESH_AUTH_POLICY_GENERATION=true make test-kafka-broker-midstream-nightly
from: src
resources:
requests:
cpu: 100m
timeout: 4h0m0s
workflow: ipi-aws
- as: test-kafka-broker-namesp-8045b51-aws-414
steps:
allow_best_effort_post_steps: true
allow_skip_on_success: true
Expand Down Expand Up @@ -72,7 +124,60 @@ tests:
cpu: 100m
timeout: 4h0m0s
workflow: ipi-aws
- as: test-kafka-broker-upstre-fbbddbf-aws-416
- as: test-kafka-broker-namesp-6e0fff9-aws-414
steps:
allow_best_effort_post_steps: true
allow_skip_on_success: true
cluster_profile: aws-serverless
env:
BASE_DOMAIN: serverless.devcluster.openshift.com
post:
- as: knative-must-gather
best_effort: true
cli: latest
commands: oc adm must-gather --image=quay.io/openshift-knative/must-gather --dest-dir
"${ARTIFACT_DIR}/gather-knative"
from: src
optional_on_success: true
resources:
requests:
cpu: 100m
timeout: 20m0s
- as: openshift-must-gather
best_effort: true
cli: latest
commands: oc adm must-gather --dest-dir "${ARTIFACT_DIR}/gather-openshift"
from: src
optional_on_success: true
resources:
requests:
cpu: 100m
timeout: 20m0s
- as: openshift-gather-extra
best_effort: true
cli: latest
commands: curl -skSL https://raw.githubusercontent.com/openshift/release/master/ci-operator/step-registry/gather/extra/gather-extra-commands.sh
| /bin/bash -s
from: src
grace_period: 1m0s
optional_on_success: true
resources:
requests:
cpu: 300m
memory: 300Mi
timeout: 20m0s
- ref: ipi-deprovision-deprovision
test:
- as: test
cli: latest
commands: SKIP_MESH_AUTH_POLICY_GENERATION=true make test-kafka-broker-namespaced-upstream-nightly
from: src
resources:
requests:
cpu: 100m
timeout: 4h0m0s
workflow: ipi-aws
- as: test-kafka-broker-upstre-fbbddbf-aws-414
steps:
allow_best_effort_post_steps: true
allow_skip_on_success: true
Expand Down Expand Up @@ -129,4 +234,4 @@ zz_generated_metadata:
branch: main
org: openshift-knative
repo: eventing-hyperfoil-benchmark
variant: "416"
variant: "414"

0 comments on commit 226d6b9

Please sign in to comment.