From b9913c356a2fdbfe0aa22cbdf263a720b04dcc16 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 3 Dec 2021 21:08:12 -0600 Subject: [PATCH] Kops - remove tests of unsupported distros --- config/jobs/kubernetes/kops/build_jobs.py | 4 +- config/jobs/kubernetes/kops/helpers.py | 4 - .../kops/kops-periodics-distros.yaml | 322 +----------------- config/testgrids/kubernetes/kops/config.yaml | 4 - 4 files changed, 3 insertions(+), 331 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index 4a4cf8482eb5..c34af8189dd4 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -690,8 +690,8 @@ def generate_conformance(): # kops-periodics-distros.yaml # ############################### def generate_distros(): - distros = ['debian9', 'debian10', 'debian11', 'ubuntu1804', 'ubuntu2004', 'ubuntu2110', - 'ubuntu2204', 'centos7', 'centos8', 'amazonlinux2', 'rhel7', 'rhel8', 'flatcar'] + distros = ['debian10', 'debian11', 'ubuntu2004', 'ubuntu2110', + 'ubuntu2204', 'amazonlinux2', 'rhel8', 'flatcar'] results = [] for distro in distros: distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn') # pylint: disable=line-too-long diff --git a/config/jobs/kubernetes/kops/helpers.py b/config/jobs/kubernetes/kops/helpers.py index f64c06969aa7..1ee876253b96 100644 --- a/config/jobs/kubernetes/kops/helpers.py +++ b/config/jobs/kubernetes/kops/helpers.py @@ -136,8 +136,6 @@ def latest_aws_image(owner, name): distro_images = { 'amzn2': latest_aws_image('137112412989', 'amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2'), - 'centos7': latest_aws_image('125523088429', 'CentOS 7.*x86_64'), - 'centos8': latest_aws_image('125523088429', 'CentOS 8.*x86_64'), 'deb9': latest_aws_image('379101102735', 'debian-stretch-hvm-x86_64-gp2-*'), 'deb10': latest_aws_image('136693071363', 'debian-10-amd64-*'), 'deb11': latest_aws_image('136693071363', 'debian-11-amd64-*'), @@ -153,8 +151,6 @@ def latest_aws_image(owner, name): distros_ssh_user = { 'amzn2': 'ec2-user', - 'centos7': 'centos', - 'centos8': 'centos', 'deb9': 'admin', 'deb10': 'admin', 'deb11': 'admin', diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml index 37e6eb902b1c..dc0b14efcda4 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml @@ -1,71 +1,7 @@ # Test jobs generated by build_jobs.py (do not manually edit) -# 13 jobs, total of 273 runs per week +# 8 jobs, total of 168 runs per week periodics: -# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imagedebian9 - cron: '2 4-23/8 * * *' - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - decorate: true - decoration_config: - timeout: 90m - extra_refs: - - org: kubernetes - repo: kops - base_ref: master - workdir: true - path_alias: k8s.io/kops - spec: - containers: - - command: - - runner.sh - args: - - bash - - -c - - | - make test-e2e-install - kubetest2 kops \ - -v 2 \ - --up --down \ - --cloud-provider=aws \ - --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ - --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 \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --parallel=25 - env: - - name: KUBE_SSH_KEY_PATH - value: /etc/aws-ssh/aws-ssh-private - - name: KUBE_SSH_USER - value: admin - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master - imagePullPolicy: Always - resources: - limits: - memory: 3Gi - requests: - cpu: "2" - memory: 3Gi - annotations: - test.kops.k8s.io/cloud: aws - test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: deb9 - 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/kops_version: '' - test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-deb9, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imagedebian9 - # {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} - name: e2e-kops-aws-distro-imagedebian10 cron: '30 6-23/8 * * *' @@ -194,70 +130,6 @@ periodics: testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-distro-imagedebian11 -# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imageubuntu1804 - cron: '11 0-23/8 * * *' - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - decorate: true - decoration_config: - timeout: 90m - extra_refs: - - org: kubernetes - repo: kops - base_ref: master - workdir: true - path_alias: k8s.io/kops - spec: - containers: - - command: - - runner.sh - args: - - bash - - -c - - | - make test-e2e-install - kubetest2 kops \ - -v 2 \ - --up --down \ - --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ - --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 \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --parallel=25 - env: - - name: KUBE_SSH_KEY_PATH - value: /etc/aws-ssh/aws-ssh-private - - name: KUBE_SSH_USER - value: ubuntu - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master - imagePullPolicy: Always - resources: - limits: - memory: 3Gi - requests: - cpu: "2" - memory: 3Gi - annotations: - test.kops.k8s.io/cloud: aws - test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: u1804 - 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/kops_version: '' - test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-u1804, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imageubuntu1804 - # {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} - name: e2e-kops-aws-distro-imageubuntu2004 cron: '53 6-23/8 * * *' @@ -450,134 +322,6 @@ periodics: testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-distro-imageubuntu2204 -# {"cloud": "aws", "container_runtime": "containerd", "distro": "centos7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imagecentos7 - cron: '50 0-23/8 * * *' - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - decorate: true - decoration_config: - timeout: 90m - extra_refs: - - org: kubernetes - repo: kops - base_ref: master - workdir: true - path_alias: k8s.io/kops - spec: - containers: - - command: - - runner.sh - args: - - bash - - -c - - | - make test-e2e-install - kubetest2 kops \ - -v 2 \ - --up --down \ - --cloud-provider=aws \ - --create-args="--image='125523088429/CentOS 7.9.2009 x86_64' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ - --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 \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --parallel=25 - env: - - name: KUBE_SSH_KEY_PATH - value: /etc/aws-ssh/aws-ssh-private - - name: KUBE_SSH_USER - value: centos - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master - imagePullPolicy: Always - resources: - limits: - memory: 3Gi - requests: - cpu: "2" - memory: 3Gi - annotations: - test.kops.k8s.io/cloud: aws - test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: centos7 - 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/kops_version: '' - test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-centos7, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imagecentos7 - -# {"cloud": "aws", "container_runtime": "containerd", "distro": "centos8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imagecentos8 - cron: '55 1-23/8 * * *' - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - decorate: true - decoration_config: - timeout: 90m - extra_refs: - - org: kubernetes - repo: kops - base_ref: master - workdir: true - path_alias: k8s.io/kops - spec: - containers: - - command: - - runner.sh - args: - - bash - - -c - - | - make test-e2e-install - kubetest2 kops \ - -v 2 \ - --up --down \ - --cloud-provider=aws \ - --create-args="--image='125523088429/CentOS 8.4.2105 x86_64' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ - --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 \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --parallel=25 - env: - - name: KUBE_SSH_KEY_PATH - value: /etc/aws-ssh/aws-ssh-private - - name: KUBE_SSH_USER - value: centos - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master - imagePullPolicy: Always - resources: - limits: - memory: 3Gi - requests: - cpu: "2" - memory: 3Gi - annotations: - test.kops.k8s.io/cloud: aws - test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: centos8 - 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/kops_version: '' - test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-centos8, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imagecentos8 - # {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} - name: e2e-kops-aws-distro-imageamazonlinux2 cron: '55 3-23/8 * * *' @@ -642,70 +386,6 @@ periodics: testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-distro-imageamazonlinux2 -# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} -- name: e2e-kops-aws-distro-imagerhel7 - cron: '24 6-23/8 * * *' - labels: - preset-service-account: "true" - preset-aws-ssh: "true" - preset-aws-credential: "true" - decorate: true - decoration_config: - timeout: 90m - extra_refs: - - org: kubernetes - repo: kops - base_ref: master - workdir: true - path_alias: k8s.io/kops - spec: - containers: - - command: - - runner.sh - args: - - bash - - -c - - | - make test-e2e-install - kubetest2 kops \ - -v 2 \ - --up --down \ - --cloud-provider=aws \ - --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ - --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 \ - -- \ - --ginkgo-args="--debug" \ - --test-args="-test.timeout=60m -num-nodes=0" \ - --test-package-marker=stable.txt \ - --parallel=25 - env: - - name: KUBE_SSH_KEY_PATH - value: /etc/aws-ssh/aws-ssh-private - - name: KUBE_SSH_USER - value: ec2-user - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master - imagePullPolicy: Always - resources: - limits: - memory: 3Gi - requests: - cpu: "2" - memory: 3Gi - annotations: - test.kops.k8s.io/cloud: aws - test.kops.k8s.io/container_runtime: containerd - test.kops.k8s.io/distro: rhel7 - 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/kops_version: '' - test.kops.k8s.io/networking: calico - testgrid-dashboards: google-aws, kops-distro-rhel7, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops - testgrid-days-of-results: '90' - testgrid-tab-name: kops-aws-distro-imagerhel7 - # {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"} - name: e2e-kops-aws-distro-imagerhel8 cron: '49 7-23/8 * * *' diff --git a/config/testgrids/kubernetes/kops/config.yaml b/config/testgrids/kubernetes/kops/config.yaml index 8cb30c5482bb..2fe605dc915a 100644 --- a/config/testgrids/kubernetes/kops/config.yaml +++ b/config/testgrids/kubernetes/kops/config.yaml @@ -11,8 +11,6 @@ dashboard_groups: - kops-gce - kops-grid - kops-distro-amzn2 - - kops-distro-centos7 - - kops-distro-centos8 - kops-distro-deb9 - kops-distro-deb10 - kops-distro-deb11 @@ -47,8 +45,6 @@ dashboards: - name: kops-gce - name: kops-grid - name: kops-distro-amzn2 -- name: kops-distro-centos7 -- name: kops-distro-centos8 - name: kops-distro-deb9 - name: kops-distro-deb10 - name: kops-distro-deb11