Skip to content

Commit 1bcd444

Browse files
author
Vishnu Challa
committed
Merge branch 'master' into rds-core
2 parents 7af39ce + 6f4fc3d commit 1bcd444

File tree

73 files changed

+1566
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1566
-117
lines changed

Diff for: ‎ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
base_images:
22
tests-base:
3-
name: "4.16"
3+
name: "4.19"
44
namespace: ocp
55
tag: tests
66
binary_build_commands: |
@@ -29,12 +29,12 @@ images:
2929
releases:
3030
initial:
3131
integration:
32-
name: "4.16"
32+
name: "4.19"
3333
namespace: ocp
3434
latest:
3535
integration:
3636
include_built_images: true
37-
name: "4.16"
37+
name: "4.19"
3838
namespace: ocp
3939
resources:
4040
'*':
@@ -59,11 +59,13 @@ tests:
5959
Pods Extended Pod Container lifecycle evicted pods should be terminal\|\[sig-node\]
6060
PodOSRejection \[NodeConformance\] Kubelet should reject pod when the node
6161
OS doesn't match pod's OS\|\[sig-network\].*for evicted pods\|\[sig-network\].*HAProxy
62-
router should override the route\|\[sig-network\].*HAProxy router should serve
63-
a route\|\[sig-network\].*HAProxy router should serve the correct\|\[sig-network\].*HAProxy
64-
router should run\|\[sig-network\].*when FIPS.*the HAProxy router\|\[sig-network\].*bond\|\[sig-network\].*all
62+
router should override the route\|\[sig-network\].*HAProxy\|\[sig-network\].*all
6563
sysctl on whitelist\|\[sig-network\].*sysctls should not affect\|\[sig-network\]
66-
pods should successfully create sandboxes by adding pod to network
64+
pods should successfully create sandboxes by adding pod to network\|\[sig-network\].*should
65+
create pingable pods with vlan interface on an in-container master\|\[sig-network\].*should
66+
create a pod with bond interface\|\[sig-node\] Variable Expansion should succeed
67+
create a pod with bond interface\|\[sig-node\] Variable Expansion should succeed
68+
in writing subpaths in container
6769
pre:
6870
- chain: ipi-azure-pre
6971
- as: kata-containers-e2e-pre

Diff for: ‎ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main__minus1.yaml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
base_images:
22
tests-base:
3-
name: "4.15"
3+
name: "4.18"
44
namespace: ocp
55
tag: tests
66
binary_build_commands: |
@@ -29,12 +29,12 @@ images:
2929
releases:
3030
initial:
3131
integration:
32-
name: "4.15"
32+
name: "4.18"
3333
namespace: ocp
3434
latest:
3535
integration:
3636
include_built_images: true
37-
name: "4.15"
37+
name: "4.18"
3838
namespace: ocp
3939
resources:
4040
'*':
@@ -50,18 +50,20 @@ tests:
5050
cluster_profile: azure4
5151
env:
5252
TEST_ARGS: ' --max-parallel-tests 5 --cluster-stability Disruptive --run ^\[sig-node\].*|^\[sig-network\] '
53-
TEST_SKIPS: \[sig-node\] Sysctls.*should support sysctls\|\[sig-node\] Security
53+
TEST_SKIPS: \[sig-node\] Pods Extended Pod Container Status should never report\|\[sig-node\]
54+
Sysctls.*should support sysctls\|\[sig-node\] Pods Extended Pod Container
55+
Status should never report success for a pending container\|\[sig-node\] Security
5456
Context should support seccomp runtime/default\|\[sig-node\] Variable Expansion
5557
should allow substituting values in a volume subpath\|\[k8s.io\] Probing container
5658
should be restarted with a docker exec liveness probe with timeout\|\[sig-node\]
5759
Pods Extended Pod Container lifecycle evicted pods should be terminal\|\[sig-node\]
5860
PodOSRejection \[NodeConformance\] Kubelet should reject pod when the node
5961
OS doesn't match pod's OS\|\[sig-network\].*for evicted pods\|\[sig-network\].*HAProxy
60-
router should override the route\|\[sig-network\].*HAProxy router should serve
61-
a route\|\[sig-network\].*HAProxy router should serve the correct\|\[sig-network\].*HAProxy
62-
router should run\|\[sig-network\].*when FIPS.*the HAProxy router\|\[sig-network\].*bond\|\[sig-network\].*all
62+
router should override the route\|\[sig-network\].*HAProxy\|\[sig-network\].*all
6363
sysctl on whitelist\|\[sig-network\].*sysctls should not affect\|\[sig-network\]
64-
pods should successfully create sandboxes by adding pod to network
64+
pods should successfully create sandboxes by adding pod to network\|\[sig-network\].*should
65+
create pingable pods with vlan interface on an in-container master\|\[sig-network\].*should
66+
create a pod with bond interface
6567
pre:
6668
- chain: ipi-azure-pre
6769
- as: kata-containers-e2e-pre

Diff for: ‎ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main__minus2.yaml

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
base_images:
22
tests-base:
3-
name: "4.14"
3+
name: "4.17"
44
namespace: ocp
55
tag: tests
66
binary_build_commands: |
@@ -29,12 +29,12 @@ images:
2929
releases:
3030
initial:
3131
integration:
32-
name: "4.14"
32+
name: "4.17"
3333
namespace: ocp
3434
latest:
3535
integration:
3636
include_built_images: true
37-
name: "4.14"
37+
name: "4.17"
3838
namespace: ocp
3939
resources:
4040
'*':
@@ -50,18 +50,21 @@ tests:
5050
cluster_profile: azure4
5151
env:
5252
TEST_ARGS: ' --max-parallel-tests 5 --cluster-stability Disruptive --run ^\[sig-node\].*|^\[sig-network\] '
53-
TEST_SKIPS: \[sig-node\] Sysctls.*should support sysctls\|\[sig-node\] Security
53+
TEST_SKIPS: \[sig-node\] Pods Extended Pod Container Status should never report\|\[sig-node\]
54+
Sysctls.*should support sysctls\|\[sig-node\] Pods Extended Pod Container
55+
Status should never report success for a pending container\|\[sig-node\] Security
5456
Context should support seccomp runtime/default\|\[sig-node\] Variable Expansion
5557
should allow substituting values in a volume subpath\|\[k8s.io\] Probing container
5658
should be restarted with a docker exec liveness probe with timeout\|\[sig-node\]
5759
Pods Extended Pod Container lifecycle evicted pods should be terminal\|\[sig-node\]
5860
PodOSRejection \[NodeConformance\] Kubelet should reject pod when the node
5961
OS doesn't match pod's OS\|\[sig-network\].*for evicted pods\|\[sig-network\].*HAProxy
60-
router should override the route\|\[sig-network\].*HAProxy router should serve
61-
a route\|\[sig-network\].*HAProxy router should serve the correct\|\[sig-network\].*HAProxy
62-
router should run\|\[sig-network\].*when FIPS.*the HAProxy router\|\[sig-network\].*bond\|\[sig-network\].*all
62+
router should override the route\|\[sig-network\].*HAProxy\|\[sig-network\].*all
6363
sysctl on whitelist\|\[sig-network\].*sysctls should not affect\|\[sig-network\]
64-
pods should successfully create sandboxes by adding pod to network
64+
pods should successfully create sandboxes by adding pod to network\|\[sig-network\].*should
65+
create pingable pods with vlan interface on an in-container master\|\[sig-network\].*should
66+
create a pod with bond interface\|\[sig-node\] Variable Expansion should succeed
67+
in writing subpaths in container
6568
pre:
6669
- chain: ipi-azure-pre
6770
- as: kata-containers-e2e-pre

Diff for: ‎ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main__minus3.yaml

+34-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
base_images:
2+
tests-base:
3+
name: "4.16"
4+
namespace: ocp
5+
tag: tests
16
binary_build_commands: |
27
# The CentOS 8 build root does not have golang package installed so that we
38
# use the golang installed by Kata Containers setup script. Here it is
@@ -13,15 +18,23 @@ images:
1318
RUN dnf install -y --nobest gettext jq
1419
from: bin
1520
to: with-deps
21+
- dockerfile_literal: |
22+
FROM tests-base
23+
RUN mv /usr/bin/openshift-tests /usr/bin/openshift-tests-original
24+
ADD https://raw.githubusercontent.com/openshift/release/master/ci-operator/config/kata-containers/kata-containers/wrapped-openshift-tests.sh /
25+
RUN cat /wrapped-openshift-tests.sh | tr -d '\r' > /usr/bin/openshift-tests
26+
RUN chmod +x /usr/bin/openshift-tests
27+
from: tests-base
28+
to: tests
1629
releases:
1730
initial:
1831
integration:
19-
name: "4.13"
32+
name: "4.16"
2033
namespace: ocp
2134
latest:
2235
integration:
2336
include_built_images: true
24-
name: "4.13"
37+
name: "4.16"
2538
namespace: ocp
2639
resources:
2740
'*':
@@ -36,13 +49,22 @@ tests:
3649
allow_skip_on_success: true
3750
cluster_profile: azure4
3851
env:
39-
TEST_ARGS: ' --max-parallel-tests 10 --run ^\[sig-node\].* '
40-
TEST_SKIPS: \[sig-node\] Sysctls.*should support sysctls\|\[sig-node\] Security
52+
TEST_ARGS: ' --max-parallel-tests 5 --cluster-stability Disruptive --run ^\[sig-node\].*|^\[sig-network\] '
53+
TEST_SKIPS: \[sig-node\] Pods Extended Pod Container Status should never report\|\[sig-node\]
54+
Sysctls.*should support sysctls\|\[sig-node\] Pods Extended Pod Container
55+
Status should never report success for a pending container\|\[sig-node\] Security
4156
Context should support seccomp runtime/default\|\[sig-node\] Variable Expansion
42-
should allow substituting values in a volume subpath\|\[sig-node\] Pods Extended
43-
Pod Container lifecycle evicted pods should be terminal\|\[sig-node\] PodOSRejection
44-
\[NodeConformance\] Kubelet should reject pod when the node OS doesn't match
45-
pod's OS
57+
should allow substituting values in a volume subpath\|\[k8s.io\] Probing container
58+
should be restarted with a docker exec liveness probe with timeout\|\[sig-node\]
59+
Pods Extended Pod Container lifecycle evicted pods should be terminal\|\[sig-node\]
60+
PodOSRejection \[NodeConformance\] Kubelet should reject pod when the node
61+
OS doesn't match pod's OS\|\[sig-network\].*for evicted pods\|\[sig-network\].*HAProxy
62+
router should override the route\|\[sig-network\].*HAProxy\|\[sig-network\].*all
63+
sysctl on whitelist\|\[sig-network\].*sysctls should not affect\|\[sig-network\]
64+
pods should successfully create sandboxes by adding pod to network\|\[sig-network\].*should
65+
create pingable pods with vlan interface on an in-container master\|\[sig-network\].*should
66+
create a pod with bond interface\|\[sig-node\] Variable Expansion should succeed
67+
in writing subpaths in container
4668
pre:
4769
- chain: ipi-azure-pre
4870
- as: kata-containers-e2e-pre
@@ -66,9 +88,11 @@ tests:
6688
export KATA_DEPLOY_IMAGE="quay.io/kata-containers/kata-deploy-ci:$(echo "$TAGS" | jq -r '.tags[] | select(.manifest_digest | contains("'"$DIGEST"'")) | .name' | grep -v "kata-containers-latest-amd64")"
6789
echo "KATA_DEPLOY_IMAGE=$KATA_DEPLOY_IMAGE"
6890
69-
# Set environment variables for the ci test.sh script
91+
# The installer is instructed to configure kata containers to use
92+
# QEMU from the RHCOS extension and host's kernel.
93+
export KATA_WITH_SYSTEM_QEMU="yes"
94+
export KATA_WITH_HOST_KERNEL="yes"
7095
export KATA_RUNTIME="kata-qemu"
71-
export WORKAROUND_9206_CRIO=yes
7296
# Install Kata Containers and run a smoke test.
7397
ci/openshift-ci/test.sh
7498

Diff for: ‎ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ tests:
6767
commands: |
6868
export BRANCH_NAME=$(curl --silent --header "X-GitHub-Api-Version:2022-11-28" "https://api.github.com/repos/IBM-Cloud/cloud-provider-ibm/branches" | grep -E '"name": "release-[0-9]+\.[0-9]+"' | awk -F'"' '{print $4}' | sort -V | tail -n 1)
6969
rebasebot --source https://github.com/IBM-Cloud/cloud-provider-ibm:${BRANCH_NAME} \
70-
--dest openshift/cloud-provider-ibm:master \
70+
--dest openshift/cloud-provider-ibm:main \
7171
--rebase openshift-cloud-team/cloud-provider-ibm:rebase-bot-master \
7272
--update-go-modules \
7373
--slack-webhook /secrets/rebasebot/slack-webhook \

Diff for: ‎ci-operator/config/openshift-pipelines/release-tests/openshift-pipelines-release-tests-release-v1.17__openshift-pipelines-ocp4.17-lp-rosa-hypershift.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
base_images:
2+
cli:
3+
name: "4.17"
4+
namespace: ocp
5+
tag: cli
6+
cli-ocm:
7+
name: cli-ocm
8+
namespace: ci
9+
tag: latest
10+
rosa-aws-cli:
11+
name: rosa-aws-cli
12+
namespace: ci
13+
tag: latest
14+
upi-installer:
15+
name: "4.17"
16+
namespace: ocp
17+
tag: upi-installer
18+
build_root:
19+
image_stream_tag:
20+
name: release
21+
namespace: openshift
22+
tag: golang-1.22
23+
images:
24+
- context_dir: .
25+
dockerfile_path: Dockerfile
26+
to: openshift-pipelines-runner
27+
releases:
28+
latest:
29+
candidate:
30+
product: ocp
31+
stream: nightly
32+
version: "4.17"
33+
resources:
34+
'*':
35+
limits:
36+
memory: 8Gi
37+
requests:
38+
cpu: "1"
39+
memory: 4Gi
40+
tests:
41+
- as: openshift-pipelines-rosa-hypershift
42+
cron: 0 23 31 2 *
43+
steps:
44+
cluster_profile: aws-cspi-qe
45+
env:
46+
FIREWATCH_CONFIG: |
47+
{
48+
"failure_rules":
49+
[
50+
{"step": "openshift-pipelines-install", "failure_type": "all", "classification": "Operator Installation Failure", "jira_project": "LPINTEROP", "group": {"name": "lp-tests", "priority": 1},"jira_additional_labels": ["!default"]},
51+
{"step": "openshift-pipelines-tests", "failure_type": "all", "classification": "Test Failure", "jira_project": "SRVKP", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default"]}
52+
]
53+
}
54+
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/rosa/lp-interop.json
55+
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.17-lp","rosa-hypershift-lp","pipelines-lp"]'
56+
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: [email protected]
57+
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
58+
FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
59+
FIREWATCH_JIRA_SERVER: https://issues.redhat.com
60+
OCM_LOGIN_ENV: staging
61+
OPENSHIFT_VERSION: "4.17"
62+
REGION: us-west-2
63+
test:
64+
- ref: cucushift-hypershift-extended-health-check
65+
- ref: openshift-pipelines-install
66+
- ref: openshift-pipelines-tests
67+
workflow: firewatch-rosa-aws-sts-hypershift
68+
zz_generated_metadata:
69+
branch: release-v1.17
70+
org: openshift-pipelines
71+
repo: release-tests
72+
variant: openshift-pipelines-ocp4.17-lp-rosa-hypershift

Diff for: ‎ci-operator/config/openshift-pipelines/release-tests/openshift-pipelines-release-tests-release-v1.18__openshift-pipelines-ocp4.19-lp-interop.yaml

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
base_images:
2+
cli:
3+
name: "4.19"
4+
namespace: ocp
5+
tag: cli
6+
build_root:
7+
image_stream_tag:
8+
name: release
9+
namespace: openshift
10+
tag: golang-1.22
11+
images:
12+
- context_dir: .
13+
dockerfile_path: Dockerfile
14+
to: openshift-pipelines-runner
15+
releases:
16+
latest:
17+
candidate:
18+
product: ocp
19+
stream: nightly
20+
version: "4.19"
21+
resources:
22+
'*':
23+
limits:
24+
memory: 4Gi
25+
requests:
26+
cpu: 100m
27+
memory: 200Mi
28+
tests:
29+
- as: openshift-pipelines-interop-aws
30+
cron: 0 23 31 2 *
31+
steps:
32+
cluster_profile: aws-cspi-qe
33+
env:
34+
BASE_DOMAIN: cspilp.interop.ccitredhat.com
35+
FIREWATCH_CONFIG: |
36+
{
37+
"failure_rules":
38+
[
39+
{"step": "openshift-cluster-bot-rbac", "failure_type": "all", "classification": "Other", "jira_additional_labels": ["!default"]},
40+
{"step": "openshift-pipelines-install", "failure_type": "all", "classification": "Operator Installation Failure", "jira_additional_labels": ["!default","interop-tests"]},
41+
{"step": "openshift-pipelines-tests", "failure_type": "all", "classification": "Test Failure", "jira_project": "SRVKP", "jira_component": ["QA"], "jira_additional_labels": ["!default","interop-tests"]}
42+
]
43+
}
44+
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
45+
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.19-lp","self-managed-lp","pipelines-lp"]'
46+
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: [email protected]
47+
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
48+
FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
49+
USER_TAGS: |
50+
scenario pipelines
51+
test:
52+
- ref: openshift-pipelines-install
53+
- ref: openshift-pipelines-tests
54+
workflow: firewatch-ipi-aws
55+
- as: openshift-pipelines-interop-aws-fips
56+
cron: 0 23 31 2 *
57+
steps:
58+
cluster_profile: aws-cspi-qe
59+
env:
60+
BASE_DOMAIN: cspilp.interop.ccitredhat.com
61+
FIPS_ENABLED: "true"
62+
FIREWATCH_CONFIG: |
63+
{
64+
"failure_rules":
65+
[
66+
{"step": "openshift-cluster-bot-rbac", "failure_type": "all", "classification": "Other", "jira_additional_labels": ["!default"]},
67+
{"step": "openshift-pipelines-install", "failure_type": "all", "classification": "Operator Installation Failure", "jira_additional_labels": ["!default","interop-tests"]},
68+
{"step": "openshift-pipelines-tests", "failure_type": "all", "classification": "Test Failure", "jira_project": "SRVKP", "jira_component": ["QA"], "jira_additional_labels": ["!default","interop-tests"]}
69+
]
70+
}
71+
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
72+
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.19-lp","self-managed-lp","pipelines-lp","fips"]'
73+
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: [email protected]
74+
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
75+
FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
76+
USER_TAGS: |
77+
scenario pipelines
78+
test:
79+
- ref: openshift-pipelines-install
80+
- ref: openshift-pipelines-tests
81+
workflow: firewatch-ipi-aws
82+
zz_generated_metadata:
83+
branch: release-v1.18
84+
org: openshift-pipelines
85+
repo: release-tests
86+
variant: openshift-pipelines-ocp4.19-lp-interop

Diff for: ‎ci-operator/config/openshift-priv/kube-compare/openshift-priv-kube-compare-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ base_images:
22
golangci-lint:
33
name: golangci-lint
44
namespace: ci
5-
tag: v1.59.0
5+
tag: v1.63.4
66
ocp_4.19_cli:
77
name: 4.19-priv
88
namespace: ocp-private

0 commit comments

Comments
 (0)