From b307da851124c564dfbb4f099f28bbe4e2df5f18 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 15 Jun 2023 10:41:21 +0300 Subject: [PATCH] kOps: Use alpha channel AMI for main AWS pre-submits --- config/jobs/kubernetes/kops/build_jobs.py | 14 +++++++-- .../kubernetes/kops/kops-presubmits-e2e.yaml | 30 +++++++++---------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index d384ed0e05b9..55bff88a738b 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -259,8 +259,12 @@ def presubmit_test(branch='master', use_boskos=False): # pylint: disable=too-many-statements,too-many-branches,too-many-arguments if cloud == 'aws': - kops_image = distro_images[distro] - kops_ssh_user = distros_ssh_user[distro] + if distro == "channels": + kops_image = None + kops_ssh_user = 'ubuntu' + else: + kops_image = distro_images[distro] + kops_ssh_user = distros_ssh_user[distro] kops_ssh_key_path = '/etc/aws-ssh/aws-ssh-private' elif cloud == 'gce': @@ -1208,7 +1212,7 @@ def generate_presubmits_e2e(): focus_regex=r'\[Conformance\]|\[NodeConformance\]', ), presubmit_test( - distro='u2204arm64', + distro='channels', k8s_version='stable', kops_channel='alpha', name='pull-kops-e2e-k8s-aws-calico', @@ -1440,6 +1444,7 @@ def generate_presubmits_e2e(): ), presubmit_test( + distro='channels', branch='release-1.26', k8s_version='1.26', kops_channel='alpha', @@ -1449,6 +1454,7 @@ def generate_presubmits_e2e(): always_run=True, ), presubmit_test( + distro='channels', branch='release-1.25', k8s_version='1.25', kops_channel='alpha', @@ -1458,6 +1464,7 @@ def generate_presubmits_e2e(): always_run=True, ), presubmit_test( + distro='channels', branch='release-1.24', k8s_version='1.24', kops_channel='alpha', @@ -1476,6 +1483,7 @@ def generate_presubmits_e2e(): always_run=True, ), presubmit_test( + distro='channels', branch='release-1.22', k8s_version='1.22', kops_channel='alpha', diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml index d9ab8f18c0cf..1011bdd64654 100644 --- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml +++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml @@ -137,7 +137,7 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-containerd-ci-ha -# {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} +# {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico branches: - master @@ -168,7 +168,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--channel=alpha --networking=calico --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 \ @@ -192,7 +192,7 @@ presubmits: memory: "6Gi" annotations: test.kops.k8s.io/cloud: aws - test.kops.k8s.io/distro: u2204arm64 + test.kops.k8s.io/distro: channels 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 @@ -1702,7 +1702,7 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-aws-1-22 -# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.26", "kops_channel": "alpha", "networking": "calico"} +# {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.26", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-26 branches: - release-1.26 @@ -1733,7 +1733,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ --kubernetes-version=https://dl.k8s.io/release/stable-1.26.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \ --test=kops \ @@ -1757,7 +1757,7 @@ presubmits: memory: "6Gi" annotations: test.kops.k8s.io/cloud: aws - test.kops.k8s.io/distro: u2204 + test.kops.k8s.io/distro: channels test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery test.kops.k8s.io/k8s_version: '1.26' test.kops.k8s.io/kops_channel: alpha @@ -1766,7 +1766,7 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-1-26 -# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.25", "kops_channel": "alpha", "networking": "calico"} +# {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.25", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-25 branches: - release-1.25 @@ -1797,7 +1797,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ --kubernetes-version=https://dl.k8s.io/release/stable-1.25.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \ --test=kops \ @@ -1821,7 +1821,7 @@ presubmits: memory: "6Gi" annotations: test.kops.k8s.io/cloud: aws - test.kops.k8s.io/distro: u2204 + test.kops.k8s.io/distro: channels test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery test.kops.k8s.io/k8s_version: '1.25' test.kops.k8s.io/kops_channel: alpha @@ -1830,7 +1830,7 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-1-25 -# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.24", "kops_channel": "alpha", "networking": "calico"} +# {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.24", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-24 branches: - release-1.24 @@ -1861,7 +1861,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ --kubernetes-version=https://dl.k8s.io/release/stable-1.24.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \ --test=kops \ @@ -1885,7 +1885,7 @@ presubmits: memory: "6Gi" annotations: test.kops.k8s.io/cloud: aws - test.kops.k8s.io/distro: u2204 + test.kops.k8s.io/distro: channels test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery test.kops.k8s.io/k8s_version: '1.24' test.kops.k8s.io/kops_channel: alpha @@ -1960,7 +1960,7 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-1-23 -# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "networking": "calico"} +# {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-22 branches: - release-1.22 @@ -1993,7 +1993,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \ --kubernetes-version=https://dl.k8s.io/release/stable-1.22.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \ --test=kops \ @@ -2017,7 +2017,7 @@ presubmits: memory: "6Gi" annotations: test.kops.k8s.io/cloud: aws - test.kops.k8s.io/distro: u2204 + test.kops.k8s.io/distro: channels test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery test.kops.k8s.io/k8s_version: '1.22' test.kops.k8s.io/kops_channel: alpha