From 5507753bdbf256010a08b9528e55a58b0c69c8a8 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 4 Nov 2021 06:18:13 +0200 Subject: [PATCH] Add tests with Ubuntu 21.10 Impish --- config/jobs/kubernetes/kops/build_jobs.py | 17 +--- config/jobs/kubernetes/kops/helpers.py | 6 +- .../kops/kops-periodics-distros.yaml | 14 ++-- .../kubernetes/kops/kops-presubmits-e2e.yaml | 79 ++----------------- config/testgrids/kubernetes/kops/config.yaml | 6 +- 5 files changed, 22 insertions(+), 100 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index 306232f3c5ba..5ca2b2b5d3b8 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -696,7 +696,7 @@ def generate_misc(): # kops-periodics-distros.yaml # ############################### def generate_distros(): - distros = ['debian9', 'debian10', 'debian11', 'ubuntu1804', 'ubuntu2004', 'ubuntu2104', + distros = ['debian9', 'debian10', 'debian11', 'ubuntu1804', 'ubuntu2004', 'ubuntu2110', 'centos7', 'centos8', 'amazonlinux2', 'rhel7', 'rhel8', 'flatcar'] results = [] for distro in distros: @@ -916,21 +916,12 @@ def generate_presubmits_e2e(): always_run=True, ), presubmit_test( - distro="u2010", + distro="u2110", networking='calico', k8s_version='stable', kops_channel='alpha', - name='pull-kops-e2e-k8s-ubuntu2010', - tab_name='e2e-ubuntu2010', - always_run=False, - ), - presubmit_test( - distro="u2104", - networking='calico', - k8s_version='stable', - kops_channel='alpha', - name='pull-kops-e2e-k8s-ubuntu2104', - tab_name='e2e-ubuntu2104', + name='pull-kops-e2e-k8s-ubuntu2110', + tab_name='e2e-ubuntu2110', always_run=False, ), presubmit_test( diff --git a/config/jobs/kubernetes/kops/helpers.py b/config/jobs/kubernetes/kops/helpers.py index ec10e25f0cf1..0e3fd9c41a4b 100644 --- a/config/jobs/kubernetes/kops/helpers.py +++ b/config/jobs/kubernetes/kops/helpers.py @@ -147,8 +147,7 @@ def latest_aws_image(owner, name): 'u1804': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*'), # pylint: disable=line-too-long 'u2004': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'), # pylint: disable=line-too-long 'u2004arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*'), # pylint: disable=line-too-long - 'u2010': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-groovy-20.10-amd64-server-*'), # pylint: disable=line-too-long - 'u2104': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-hirsute-21.04-amd64-server-*'), # pylint: disable=line-too-long + 'u2110': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-impish-21.10-arm64-server-*'), # pylint: disable=line-too-long } distros_ssh_user = { @@ -164,6 +163,5 @@ def latest_aws_image(owner, name): 'u1804': 'ubuntu', 'u2004': 'ubuntu', 'u2004arm64': 'ubuntu', - 'u2010': 'ubuntu', - 'u2104': 'ubuntu', + 'u2110': 'ubuntu', } diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml index 90701634ad6e..298d8e194740 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml @@ -317,9 +317,9 @@ periodics: testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-distro-imageubuntu2004 -# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2104", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imageubuntu2104 - cron: '10 1-23/8 * * *' +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2110", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} +- name: e2e-kops-aws-distro-imageubuntu2110 + cron: '14 1-23/8 * * *' labels: preset-service-account: "true" preset-aws-ssh: "true" @@ -346,7 +346,7 @@ periodics: -v 2 \ --up --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-hirsute-21.04-amd64-server-20211028' --channel=alpha --networking=calico --container-runtime=containerd" \ + --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-impish-21.10-arm64-server-20211014' --channel=alpha --networking=calico --container-runtime=containerd" \ --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \ --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \ --test=kops \ @@ -371,14 +371,14 @@ periodics: annotations: test.kops.k8s.io/cloud: aws test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: u2104 + test.kops.k8s.io/distro: u2110 test.kops.k8s.io/k8s_version: stable test.kops.k8s.io/kops_channel: alpha test.kops.k8s.io/kops_version: '' test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-u2104, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops + testgrid-dashboards: google-aws, kops-distro-u2110, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imageubuntu2104 + testgrid-tab-name: kops-aws-distro-imageubuntu2110 # {"cloud": "aws", "container_runtime": "containerd", "distro": "centos7", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} - name: e2e-kops-aws-distro-imagecentos7 diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml index 4463801c78dd..187577a4cd51 100644 --- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml +++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml @@ -1,5 +1,5 @@ # Test jobs generated by build_jobs.py (do not manually edit) -# 27 jobs + # 26 jobs presubmits: kubernetes/kops: @@ -270,8 +270,8 @@ presubmits: testgrid-days-of-results: '90' testgrid-tab-name: e2e-containerd -# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2010", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - - name: pull-kops-e2e-k8s-ubuntu2010 +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2110", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} + - name: pull-kops-e2e-k8s-ubuntu2110 branches: - master always_run: false @@ -302,7 +302,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-groovy-20.10-amd64-server-20210720' --channel=alpha --networking=calico --container-runtime=containerd" \ + --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-impish-21.10-arm64-server-20211014' --channel=alpha --networking=calico --container-runtime=containerd" \ --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \ --test=kops \ @@ -327,78 +327,13 @@ presubmits: annotations: test.kops.k8s.io/cloud: aws test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: u2010 + test.kops.k8s.io/distro: u2110 test.kops.k8s.io/k8s_version: stable test.kops.k8s.io/kops_channel: alpha test.kops.k8s.io/networking: calico - testgrid-dashboards: kops-distro-u2010, kops-k8s-stable, kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops + testgrid-dashboards: kops-distro-u2110, kops-k8s-stable, kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops testgrid-days-of-results: '90' - testgrid-tab-name: e2e-ubuntu2010 - -# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2104", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - - name: pull-kops-e2e-k8s-ubuntu2104 - branches: - - master - always_run: false - skip_report: false - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - preset-bazel-scratch-dir: "true" - preset-bazel-remote-cache-enabled: "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:v20211022-00550799a0-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-hirsute-21.04-amd64-server-20211028' --channel=alpha --networking=calico --container-runtime=containerd" \ - --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \ - --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \ - --test=kops \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --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/container_runtime: containerd - test.kops.k8s.io/distro: u2104 - test.kops.k8s.io/k8s_version: stable - test.kops.k8s.io/kops_channel: alpha - test.kops.k8s.io/networking: calico - testgrid-dashboards: kops-distro-u2104, kops-k8s-stable, kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: e2e-ubuntu2104 + testgrid-tab-name: e2e-ubuntu2110 # {"cloud": "aws", "container_runtime": "containerd", "distro": "deb11", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-debian11 diff --git a/config/testgrids/kubernetes/kops/config.yaml b/config/testgrids/kubernetes/kops/config.yaml index 39c7dbc8e60b..a3aa9af4d61f 100644 --- a/config/testgrids/kubernetes/kops/config.yaml +++ b/config/testgrids/kubernetes/kops/config.yaml @@ -21,8 +21,7 @@ dashboard_groups: - kops-distro-u1804 - kops-distro-u2004 - kops-distro-u2004arm64 - - kops-distro-u2010 - - kops-distro-u2104 + - kops-distro-u2110 - kops-k8s-1.18 - kops-k8s-1.19 - kops-k8s-1.20 @@ -56,8 +55,7 @@ dashboards: - name: kops-distro-u1804 - name: kops-distro-u2004 - name: kops-distro-u2004arm64 -- name: kops-distro-u2010 -- name: kops-distro-u2104 +- name: kops-distro-u2110 - name: kops-k8s-1.18 - name: kops-k8s-1.19 - name: kops-k8s-1.20