From 0075c523002b23d5c535e297037209f044be6aa2 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 7 Dec 2021 21:13:28 +0200 Subject: [PATCH] Run daily conformance tests for k8s 1.23 and arm64 --- config/jobs/kubernetes/kops/build_jobs.py | 22 +- .../kops/kops-periodics-conformance.yaml | 266 +++++++++++++++++- config/testgrids/kubernetes/kops/config.yaml | 4 + 3 files changed, 290 insertions(+), 2 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index ee7b7e5c9011..86e7063fa163 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -667,7 +667,7 @@ def generate_misc(): ################################ def generate_conformance(): results = [] - for version in ['1.22', '1.21']: + for version in ['1.23', '1.22', '1.21']: results.append( build_test( k8s_version=version, @@ -684,6 +684,26 @@ def generate_conformance(): skip_regex=r'\[NoSkip\]', ) ) + results.append( + build_test( + k8s_version=version, + kops_version=version, + irsa=version >= '1.22', + kops_channel='alpha', + name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}", + networking='calico', + distro="u2004arm64", + extra_flags=["--zones=eu-central-1a", + "--node-size=t4g.large", + "--master-size=t4g.large"], + test_parallelism=1, + test_timeout_minutes=150, + extra_dashboards=['kops-conformance'], + runs_per_day=1, + focus_regex=r'\[Conformance\]', + skip_regex=r'\[NoSkip\]', + ) + ) return results ############################### diff --git a/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml b/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml index 6bbc0f8f0d91..66d7d74b4ced 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml @@ -1,7 +1,139 @@ # Test jobs generated by build_jobs.py (do not manually edit) -# 2 jobs, total of 14 runs per week +# 6 jobs, total of 42 runs per week periodics: +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.23", "kops_channel": "alpha", "kops_version": "1.23", "networking": "calico"} +- name: e2e-kops-aws-conformance-1-23 + cron: '5 11-23/24 * * *' + labels: + preset-service-account: "true" + preset-aws-ssh: "true" + preset-aws-credential: "true" + decorate: true + decoration_config: + timeout: 180m + 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-focal-20.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/markers/release-1.23/latest-ci-updown-green.txt \ + --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.23.txt \ + --test=kops \ + -- \ + --ginkgo-args="--debug" \ + --test-args="-test.timeout=150m -num-nodes=0" \ + --test-package-marker=stable-1.23.txt \ + --focus-regex="\[Conformance\]" \ + --skip-regex="\[NoSkip\]" \ + --parallel=1 + 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: u2004 + test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery + test.kops.k8s.io/k8s_version: '1.23' + test.kops.k8s.io/kops_channel: alpha + test.kops.k8s.io/kops_version: '1.23' + test.kops.k8s.io/networking: calico + testgrid-dashboards: google-aws, kops-1.23, kops-conformance, kops-distro-u2004, kops-k8s-1.23, sig-cluster-lifecycle-kops + testgrid-days-of-results: '90' + testgrid-tab-name: kops-aws-conformance-1-23 + +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.23", "kops_channel": "alpha", "kops_version": "1.23", "networking": "calico"} +- name: e2e-kops-aws-conformance-arm64-1-23 + cron: '35 8-23/24 * * *' + labels: + preset-service-account: "true" + preset-aws-ssh: "true" + preset-aws-credential: "true" + decorate: true + decoration_config: + timeout: 180m + 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-focal-20.04-arm64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \ + --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.23/latest-ci-updown-green.txt \ + --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.23.txt \ + --test=kops \ + -- \ + --ginkgo-args="--debug" \ + --test-args="-test.timeout=150m -num-nodes=0" \ + --test-package-marker=stable-1.23.txt \ + --focus-regex="\[Conformance\]" \ + --skip-regex="\[NoSkip\]" \ + --parallel=1 + 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: u2004arm64 + test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery + test.kops.k8s.io/k8s_version: '1.23' + test.kops.k8s.io/kops_channel: alpha + test.kops.k8s.io/kops_version: '1.23' + test.kops.k8s.io/networking: calico + testgrid-dashboards: google-aws, kops-1.23, kops-conformance, kops-distro-u2004arm64, kops-k8s-1.23, sig-cluster-lifecycle-kops + testgrid-days-of-results: '90' + testgrid-tab-name: kops-aws-conformance-arm64-1-23 + # {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"} - name: e2e-kops-aws-conformance-1-22 cron: '55 5-23/24 * * *' @@ -68,6 +200,72 @@ periodics: testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-conformance-1-22 +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"} +- name: e2e-kops-aws-conformance-arm64-1-22 + cron: '49 6-23/24 * * *' + labels: + preset-service-account: "true" + preset-aws-ssh: "true" + preset-aws-credential: "true" + decorate: true + decoration_config: + timeout: 180m + 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-focal-20.04-arm64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \ + --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \ + --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \ + --test=kops \ + -- \ + --ginkgo-args="--debug" \ + --test-args="-test.timeout=150m -num-nodes=0" \ + --test-package-marker=stable-1.22.txt \ + --focus-regex="\[Conformance\]" \ + --skip-regex="\[NoSkip\]" \ + --parallel=1 + 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: u2004arm64 + test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery + test.kops.k8s.io/k8s_version: '1.22' + test.kops.k8s.io/kops_channel: alpha + test.kops.k8s.io/kops_version: '1.22' + test.kops.k8s.io/networking: calico + testgrid-dashboards: google-aws, kops-1.22, kops-conformance, kops-distro-u2004arm64, kops-k8s-1.22, sig-cluster-lifecycle-kops + testgrid-days-of-results: '90' + testgrid-tab-name: kops-aws-conformance-arm64-1-22 + # {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"} - name: e2e-kops-aws-conformance-1-21 cron: '29 23-23/24 * * *' @@ -132,3 +330,69 @@ periodics: testgrid-dashboards: google-aws, kops-1.21, kops-conformance, kops-distro-u2004, kops-k8s-1.21, sig-cluster-lifecycle-kops testgrid-days-of-results: '90' testgrid-tab-name: kops-aws-conformance-1-21 + +# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"} +- name: e2e-kops-aws-conformance-arm64-1-21 + cron: '11 4-23/24 * * *' + labels: + preset-service-account: "true" + preset-aws-ssh: "true" + preset-aws-credential: "true" + decorate: true + decoration_config: + timeout: 180m + 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-focal-20.04-arm64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large" \ + --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \ + --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \ + --test=kops \ + -- \ + --ginkgo-args="--debug" \ + --test-args="-test.timeout=150m -num-nodes=0" \ + --test-package-marker=stable-1.21.txt \ + --focus-regex="\[Conformance\]" \ + --skip-regex="\[NoSkip\]" \ + --parallel=1 + 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: u2004arm64 + test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large + test.kops.k8s.io/k8s_version: '1.21' + test.kops.k8s.io/kops_channel: alpha + test.kops.k8s.io/kops_version: '1.21' + test.kops.k8s.io/networking: calico + testgrid-dashboards: google-aws, kops-1.21, kops-conformance, kops-distro-u2004arm64, kops-k8s-1.21, sig-cluster-lifecycle-kops + testgrid-days-of-results: '90' + testgrid-tab-name: kops-aws-conformance-arm64-1-21 diff --git a/config/testgrids/kubernetes/kops/config.yaml b/config/testgrids/kubernetes/kops/config.yaml index 2fe605dc915a..42ebe34d5784 100644 --- a/config/testgrids/kubernetes/kops/config.yaml +++ b/config/testgrids/kubernetes/kops/config.yaml @@ -27,11 +27,13 @@ dashboard_groups: - kops-k8s-1.20 - kops-k8s-1.21 - kops-k8s-1.22 + - kops-k8s-1.23 - kops-k8s-ci - kops-k8s-latest - kops-k8s-stable - kops-1.21 - kops-1.22 + - kops-1.23 - kops-latest dashboards: @@ -61,9 +63,11 @@ dashboards: - name: kops-k8s-1.20 - name: kops-k8s-1.21 - name: kops-k8s-1.22 +- name: kops-k8s-1.23 - name: kops-k8s-ci - name: kops-k8s-latest - name: kops-k8s-stable - name: kops-1.21 - name: kops-1.22 +- name: kops-1.23 - name: kops-latest