Skip to content

Commit d803f6a

Browse files
authored
Merge pull request #35250 from xmudrii/test-disco-store
Remove discovery-store from pull-kops-aws-distro-al2023
2 parents e153423 + ace26b0 commit d803f6a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def presubmit_test(branch='master',
336336
if extra_flags is None:
337337
extra_flags = []
338338

339-
if irsa and cloud == "aws" and scenario is None:
339+
if irsa and cloud == "aws" and scenario is None and name != "pull-kops-aws-distro-al2023":
340340
extra_flags.append("--discovery-store=s3://k8s-kops-prow/discovery")
341341

342342
marker, k8s_deploy_url, test_package_url, test_package_dir = k8s_version_info(k8s_version)

config/jobs/kubernetes/kops/kops-presubmits-distros.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ presubmits:
673673
testgrid-days-of-results: '90'
674674
testgrid-tab-name: e2e-amazonlinux2
675675

676-
# {"cloud": "aws", "distro": "al2023", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
676+
# {"cloud": "aws", "distro": "al2023", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
677677
- name: pull-kops-aws-distro-al2023
678678
cluster: k8s-infra-kops-prow-build
679679
branches:
@@ -705,7 +705,7 @@ presubmits:
705705
-v 2 \
706706
--up --build --down \
707707
--cloud-provider=aws \
708-
--create-args="--image='137112412989/al2023-ami-2023.7.20250609.0-kernel-6.1-x86_64' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
708+
--create-args="--image='137112412989/al2023-ami-2023.7.20250609.0-kernel-6.1-x86_64' --channel=alpha --networking=calico" \
709709
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
710710
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
711711
--test=kops \
@@ -732,7 +732,6 @@ presubmits:
732732
annotations:
733733
test.kops.k8s.io/cloud: aws
734734
test.kops.k8s.io/distro: al2023
735-
test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
736735
test.kops.k8s.io/k8s_version: stable
737736
test.kops.k8s.io/kops_channel: alpha
738737
test.kops.k8s.io/networking: calico

0 commit comments

Comments
 (0)