Skip to content

Commit 587114b

Browse files
tbuskeytbuskey
committed
[DEBUG] [DO NOT MERGE]
1 parent f6c074b commit 587114b

File tree

3 files changed

+51
-165
lines changed

3 files changed

+51
-165
lines changed

‎ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main.yaml

Lines changed: 47 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,63 @@
11
base_images:
2-
tests-base:
2+
ansible:
33
name: "4.19"
44
namespace: ocp
5-
tag: tests
6-
binary_build_commands: |
7-
# The CentOS 8 build root does not have golang package installed so that we
8-
# use the golang installed by Kata Containers setup script. Here it is
9-
# ensured the tools are searcheable.
10-
export GOPATH=/go
11-
export PATH="${GOPATH}/bin:/usr/local/go/bin/:$PATH"
12-
build_root:
13-
project_image:
14-
dockerfile_path: ci/openshift-ci/images/Dockerfile.buildroot
15-
images:
16-
- dockerfile_literal: |
17-
FROM bin
18-
RUN dnf install -y --nobest gettext jq
19-
from: bin
20-
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
5+
tag: ansible
6+
cli:
7+
name: "4.19"
8+
namespace: ocp
9+
tag: cli
10+
openstack-installer:
11+
name: "4.19"
12+
namespace: ocp
13+
tag: openstack-installer
14+
tests-private:
15+
name: tests-private
16+
namespace: ci
17+
tag: "4.19"
18+
tools:
19+
name: "4.19"
20+
namespace: ocp
21+
tag: tools
22+
upi-installer:
23+
name: "4.19"
24+
namespace: ocp
25+
tag: upi-installer
2926
releases:
30-
initial:
31-
integration:
32-
name: "4.19"
33-
namespace: ocp
3427
latest:
35-
integration:
36-
include_built_images: true
37-
name: "4.19"
38-
namespace: ocp
28+
release:
29+
architecture: amd64
30+
channel: candidate
31+
version: "4.19"
3932
resources:
4033
'*':
4134
requests:
4235
cpu: 100m
43-
memory: 2Gi
36+
memory: 200Mi
4437
tests:
45-
- as: e2e-tests
46-
cron: 2 7 * * *
38+
- as: azure-ipi-kata
39+
cron: '@yearly'
4740
steps:
48-
allow_best_effort_post_steps: true
49-
allow_skip_on_success: true
50-
cluster_profile: azure4
41+
cluster_profile: azure-qe
5142
env:
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
56-
Context should support seccomp runtime/default\|\[sig-node\] Variable Expansion
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-
create a pod with bond interface\|\[sig-node\] Variable Expansion should succeed
68-
in writing subpaths in container
43+
BASE_DOMAIN: qe.azure.devcluster.openshift.com
44+
COMPUTE_NODE_REPLICAS: "2"
45+
CUSTOM_AZURE_REGION: eastus
46+
SLEEP_DURATION: 2h
47+
SPOT_INSTANCES: "false"
48+
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;41566
49+
TEST_SCENARIOS: Kata
50+
TEST_TIMEOUT: "75"
51+
post:
52+
- ref: cucushift-installer-wait
53+
- chain: ipi-azure-post
6954
pre:
70-
- chain: ipi-azure-pre
71-
- as: kata-containers-e2e-pre
72-
cli: latest
73-
commands: |
74-
# oc is made available to this script via cli configuration, but
75-
# kubectl is not. Since kubectl is used by kata-webhook scripts,
76-
# thus it is created a symlink to oc.
77-
pushd "$CLI_DIR"
78-
if [ ! -f kubectl ]; then
79-
ln -s oc kubectl
80-
fi
81-
popd
82-
# TODO: The ipi-azure test step does not export AZURE_AUTH_LOCATION
83-
# which causes openshift-tests to fail.
84-
export AZURE_AUTH_LOCATION=${SHARED_DIR}/metadata.json
85-
86-
# Get the current latest kata-containers image
87-
TAGS="$(curl https://quay.io/api/v1/repository/kata-containers/kata-deploy-ci/tag/?onlyActiveTags=true)"
88-
DIGEST=$(echo "$TAGS" | jq -r '.tags[] | select(.name | contains("kata-containers-latest-amd64")) | .manifest_digest')
89-
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")"
90-
echo "KATA_DEPLOY_IMAGE=$KATA_DEPLOY_IMAGE"
91-
92-
# The installer is instructed to configure kata containers to use
93-
# QEMU from the RHCOS extension and host's kernel.
94-
export KATA_WITH_SYSTEM_QEMU="yes"
95-
export KATA_WITH_HOST_KERNEL="yes"
96-
export KATA_RUNTIME="kata-qemu"
97-
# Install Kata Containers and run a smoke test.
98-
ci/openshift-ci/test.sh
99-
100-
# Deploy the kata-webhook so that the tests ran on next step of the
101-
# workflow will use the kata runtime.
102-
ci/openshift-ci/cluster/deploy_webhook.sh
103-
from: with-deps
104-
resources:
105-
requests:
106-
cpu: 100m
107-
memory: 200Mi
108-
workflow: openshift-e2e-azure
55+
- chain: ipi-conf-azure
56+
- ref: ipi-conf-azure-custom-region
57+
- chain: azure-provision-service-principal-minimal-permission
58+
- chain: ipi-install
59+
test:
60+
- chain: openshift-e2e-test-qe
10961
zz_generated_metadata:
11062
branch: main
11163
org: kata-containers

‎ci-operator/jobs/kata-containers/kata-containers/kata-containers-kata-containers-main-periodics.yaml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
periodics:
22
- agent: kubernetes
33
cluster: build07
4-
cron: 2 7 * * *
4+
cron: '@yearly'
55
decorate: true
66
decoration_config:
77
skip_cloning: true
@@ -11,21 +11,10 @@ periodics:
1111
repo: kata-containers
1212
labels:
1313
ci-operator.openshift.io/cloud: azure4
14-
ci-operator.openshift.io/cloud-cluster-profile: azure4
14+
ci-operator.openshift.io/cloud-cluster-profile: azure-qe
1515
ci.openshift.io/generator: prowgen
1616
pj-rehearse.openshift.io/can-be-rehearsed: "true"
17-
name: periodic-ci-kata-containers-kata-containers-main-e2e-tests
18-
reporter_config:
19-
slack:
20-
channel: '#kata-ocp-ci-reports'
21-
job_states_to_report:
22-
- success
23-
- failure
24-
- error
25-
report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
26-
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
27-
:volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
28-
logs> :volcano: {{end}}'
17+
name: periodic-ci-kata-containers-kata-containers-main-azure-ipi-kata
2918
spec:
3019
containers:
3120
- args:
@@ -34,7 +23,7 @@ periodics:
3423
- --lease-server-credentials-file=/etc/boskos/credentials
3524
- --report-credentials-file=/etc/report/credentials
3625
- --secret-dir=/secrets/ci-pull-credentials
37-
- --target=e2e-tests
26+
- --target=azure-ipi-kata
3827
command:
3928
- ci-operator
4029
image: ci-operator:latest

‎ci-operator/jobs/kata-containers/kata-containers/kata-containers-kata-containers-main-presubmits.yaml

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,5 @@
11
presubmits:
22
kata-containers/kata-containers:
3-
- agent: kubernetes
4-
always_run: true
5-
branches:
6-
- ^main$
7-
- ^main-
8-
cluster: build05
9-
context: ci/prow/images
10-
decorate: true
11-
decoration_config:
12-
skip_cloning: true
13-
labels:
14-
ci.openshift.io/generator: prowgen
15-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16-
name: pull-ci-kata-containers-kata-containers-main-images
17-
rerun_command: /test images
18-
spec:
19-
containers:
20-
- args:
21-
- --gcs-upload-secret=/secrets/gcs/service-account.json
22-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
23-
- --report-credentials-file=/etc/report/credentials
24-
- --target=[images]
25-
command:
26-
- ci-operator
27-
image: ci-operator:latest
28-
imagePullPolicy: Always
29-
name: ""
30-
resources:
31-
requests:
32-
cpu: 10m
33-
volumeMounts:
34-
- mountPath: /secrets/gcs
35-
name: gcs-credentials
36-
readOnly: true
37-
- mountPath: /secrets/manifest-tool
38-
name: manifest-tool-local-pusher
39-
readOnly: true
40-
- mountPath: /etc/pull-secret
41-
name: pull-secret
42-
readOnly: true
43-
- mountPath: /etc/report
44-
name: result-aggregator
45-
readOnly: true
46-
serviceAccountName: ci-operator
47-
volumes:
48-
- name: manifest-tool-local-pusher
49-
secret:
50-
secretName: manifest-tool-local-pusher
51-
- name: pull-secret
52-
secret:
53-
secretName: registry-pull-credentials
54-
- name: result-aggregator
55-
secret:
56-
secretName: result-aggregator
57-
trigger: (?m)^/test( | .* )images,?($|\s.*)
583
- agent: kubernetes
594
always_run: true
605
branches:

0 commit comments

Comments
 (0)