Skip to content

Commit

Permalink
kops: Create jobs to test Cilium skips
Browse files Browse the repository at this point in the history
  • Loading branch information
@johngmyers
johngmyers committed Aug 6, 2023
1 parent 1dfc863 commit 7700e77
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 1 deletion.
27 changes: 27 additions & 0 deletions config/jobs/kubernetes/kops/build_jobs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,33 @@ def generate_presubmits_network_plugins():
optional=optional,
)
)

# See which tests no longer need to be skipped on Cilium
results.append(
presubmit_test(
name=f"pull-kops-e2e-cni-cilium-noskip",
distro='u2204arm64',
tab_name=f"e2e-cilium-noskip",
networking='cilium',
skip_regex='SSH.should.SSH.to.all.nodes.and.run.commands',
optional=True,
)
)
results.append(
presubmit_test(
name=f"pull-kops-e2e-cni-cilium-ipv6-noskip",
distro='u2204arm64',
tab_name=f"e2e-cilium-ipv6-noskip",
networking='cilium',
extra_flags=['--ipv6',
'--topology=private',
'--bastion',
'--zones=us-west-2a',
],
skip_regex='SSH.should.SSH.to.all.nodes.and.run.commands',
optional=True,
)
)
return results

############################
Expand Down
132 changes: 131 additions & 1 deletion config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Test jobs generated by build_jobs.py (do not manually edit)
# 11 jobs
# 13 jobs
presubmits:
kubernetes/kops:

Expand Down Expand Up @@ -716,3 +716,133 @@ presubmits:
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
testgrid-days-of-results: '90'
testgrid-tab-name: e2e-kuberouter

# {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
- name: pull-kops-e2e-cni-cilium-noskip
branches:
- master
always_run: false
optional: true
skip_report: false
labels:
preset-service-account: "true"
preset-aws-ssh: "true"
preset-aws-credential: "true"
preset-dind-enabled: "true"
decorate: true
decoration_config:
timeout: 90m
path_alias: k8s.io/kops
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
imagePullPolicy: Always
command:
- runner.sh
args:
- bash
- -c
- |
make test-e2e-install
kubetest2 kops \
-v 2 \
--up --build --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230728' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-marker=stable.txt \
--skip-regex="SSH.should.SSH.to.all.nodes.and.run.commands" \
--parallel=25
securityContext:
privileged: true
env:
- name: KUBE_SSH_KEY_PATH
value: /etc/aws-ssh/aws-ssh-private
- name: KUBE_SSH_USER
value: ubuntu
- name: GOPATH
value: /home/prow/go
resources:
requests:
cpu: "2"
memory: "6Gi"
annotations:
test.kops.k8s.io/cloud: aws
test.kops.k8s.io/distro: u2204arm64
test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
test.kops.k8s.io/k8s_version: stable
test.kops.k8s.io/kops_channel: alpha
test.kops.k8s.io/networking: cilium
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
testgrid-days-of-results: '90'
testgrid-tab-name: e2e-cilium-noskip

# {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--ipv6 --topology=private --bastion --zones=us-west-2a --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
- name: pull-kops-e2e-cni-cilium-ipv6-noskip
branches:
- master
always_run: false
optional: true
skip_report: false
labels:
preset-service-account: "true"
preset-aws-ssh: "true"
preset-aws-credential: "true"
preset-dind-enabled: "true"
decorate: true
decoration_config:
timeout: 90m
path_alias: k8s.io/kops
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
imagePullPolicy: Always
command:
- runner.sh
args:
- bash
- -c
- |
make test-e2e-install
kubetest2 kops \
-v 2 \
--up --build --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230728' --channel=alpha --networking=cilium --ipv6 --topology=private --bastion --zones=us-west-2a --discovery-store=s3://k8s-kops-prow/discovery" \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-marker=stable.txt \
--skip-regex="SSH.should.SSH.to.all.nodes.and.run.commands" \
--parallel=25
securityContext:
privileged: true
env:
- name: KUBE_SSH_KEY_PATH
value: /etc/aws-ssh/aws-ssh-private
- name: KUBE_SSH_USER
value: ubuntu
- name: GOPATH
value: /home/prow/go
resources:
requests:
cpu: "2"
memory: "6Gi"
annotations:
test.kops.k8s.io/cloud: aws
test.kops.k8s.io/distro: u2204arm64
test.kops.k8s.io/extra_flags: --ipv6 --topology=private --bastion --zones=us-west-2a --discovery-store=s3://k8s-kops-prow/discovery
test.kops.k8s.io/k8s_version: stable
test.kops.k8s.io/kops_channel: alpha
test.kops.k8s.io/networking: cilium
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
testgrid-days-of-results: '90'
testgrid-tab-name: e2e-cilium-ipv6-noskip

0 comments on commit 7700e77

Please sign in to comment.