From f1092e8ff46bdfa52b4372459ac6d7a491d66d03 Mon Sep 17 00:00:00 2001 From: fabriziopandini Date: Sat, 11 May 2019 20:52:41 +0200 Subject: [PATCH] cleanup-kubeadm-gce-jobs --- .../kubeadm-upgrade.yaml | 126 ---------------- .../sig-cluster-lifecycle/kubeadm-x-on-y.yaml | 105 -------------- .../sig-cluster-lifecycle/kubeadm.yaml | 135 ------------------ testgrid/config.yaml | 49 ------- 4 files changed, 415 deletions(-) delete mode 100644 config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-upgrade.yaml delete mode 100644 config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-x-on-y.yaml delete mode 100644 config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm.yaml diff --git a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-upgrade.yaml b/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-upgrade.yaml deleted file mode 100644 index 54770e6c9e2c..000000000000 --- a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-upgrade.yaml +++ /dev/null @@ -1,126 +0,0 @@ -# kubeadm upgrade tests -periodics: -# manual-release-bump-required (create a new job and delete the oldest) -- name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-11-1-12 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.12 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --check-version-skew=false - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=release/latest-1.12 - - --extract=ci/latest-bazel-1.11 - - --gcp-zone=us-west1-b - - --kubeadm=periodic - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.11 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.11 - - --kubernetes-anywhere-upgrade-method=upgrade - - --provider=skeleton - - --skew - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - - --upgrade_args=--ginkgo.focus=\[Feature:MasterUpgrade\] --ginkgo.skip=statefulset-upgrade|hpa-upgrade|service-upgrade --upgrade-target=release/latest-1.12 - -- name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-12-1-13 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.13 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --check-version-skew=false - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=release/latest-1.13 - - --extract=ci/latest-bazel-1.12 - - --gcp-zone=us-west1-b - - --kubeadm=periodic - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.12 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.12 - - --kubernetes-anywhere-upgrade-method=upgrade - - --provider=skeleton - - --skew - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - - --upgrade_args=--ginkgo.focus=\[Feature:MasterUpgrade\] --ginkgo.skip=statefulset-upgrade|hpa-upgrade|service-upgrade --upgrade-target=release/latest-1.13 - -- name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-13-1-14 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.14 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --check-version-skew=false - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=release/latest-1.14 - - --extract=ci/latest-bazel-1.13 - - --gcp-zone=us-west1-b - - --kubeadm=periodic - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.13 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.13 - - --kubernetes-anywhere-upgrade-method=upgrade - - --provider=skeleton - - --skew - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - - --upgrade_args=--ginkgo.focus=\[Feature:MasterUpgrade\] --ginkgo.skip=statefulset-upgrade|hpa-upgrade|service-upgrade --upgrade-target=release/latest-1.14 - -- name: ci-kubernetes-e2e-kubeadm-gce-upgrade-stable-master - interval: 6h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=master - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --check-version-skew=false - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest - - --extract=release/stable - - --gcp-zone=us-west1-b - - --kubeadm=periodic - - --kubernetes-anywhere-kubelet-version=stable - - --kubernetes-anywhere-kubernetes-version=stable - - --kubernetes-anywhere-upgrade-method=upgrade - - --provider=skeleton - - --skew - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - - --upgrade_args=--ginkgo.focus=\[Feature:MasterUpgrade\] --ginkgo.skip=statefulset-upgrade|hpa-upgrade|service-upgrade --upgrade-target=ci-cross/latest diff --git a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-x-on-y.yaml b/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-x-on-y.yaml deleted file mode 100644 index 1f91080c7604..000000000000 --- a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-x-on-y.yaml +++ /dev/null @@ -1,105 +0,0 @@ -# kubeadm x-on-y tests -periodics: -- name: ci-kubernetes-e2e-kubeadm-gce-1-11-on-1-12 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.12 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.11 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.11 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.11 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-1-12-on-1-13 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.13 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.12 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.12 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.12 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-1-13-on-1-14 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-1.14 - args: - - --repo=k8s.io/kubernetes=release-1.14 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.13 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.13 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.13 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-stable-on-master - interval: 4h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=master - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=release/stable - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-version=stable - - --kubernetes-anywhere-kubernetes-version=stable - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m diff --git a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm.yaml b/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm.yaml deleted file mode 100644 index 667783d68cbd..000000000000 --- a/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm.yaml +++ /dev/null @@ -1,135 +0,0 @@ -periodics: -- name: ci-kubernetes-e2e-kubeadm-gce-1-11 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.11 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.11 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.11 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.11 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-1-12 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.12 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.12 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.12 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.12 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-1-13 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-master - args: - - --repo=k8s.io/kubernetes=release-1.13 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.13 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.13 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.13 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-1-14 - interval: 12h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190509-e418529-1.14 - args: - - --repo=k8s.io/kubernetes=release-1.14 - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel-1.14 - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.14 - - --kubernetes-anywhere-kubernetes-version=ci/latest-1.14 - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 --num-nodes=4 - - --timeout=300m - -- name: ci-kubernetes-e2e-kubeadm-gce-master - interval: 2h - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:latest-master - imagePullPolicy: Always - args: - - --repo=k8s.io/kubernetes=master - - --repo=k8s.io/kubernetes-anywhere=kubeadm-e2e - - --timeout=320 - - --upload=gs://kubernetes-jenkins/logs - - --scenario=kubernetes_e2e - - -- - # TODO: --kubernetes-anywhere-kubernetes-version should really be ci/latest-bazel but we need changes to kubeadm and possibly kubernetes-anywhere first - - --cluster= - - --deployment=kubernetes-anywhere - - --extract=ci/latest-bazel - - --gcp-zone=us-west1-b - - --kubeadm=ci - - --kubernetes-anywhere-kubelet-ci-version=latest-bazel - - --kubernetes-anywhere-kubernetes-version=ci-cross/latest - - --provider=skeleton - - --test_args=--ginkgo.focus=\[Conformance\]|\[Feature:BootstrapTokens\]|\[Feature:NodeAuthorizer\] --minStartupPods=8 --num-nodes=4 - - --timeout=300m diff --git a/testgrid/config.yaml b/testgrid/config.yaml index c6788fc1926c..4f7136631743 100644 --- a/testgrid/config.yaml +++ b/testgrid/config.yaml @@ -3820,33 +3820,6 @@ dashboards: - name: sig-cluster-lifecycle-all dashboard_tab: -# kubeadm-gce tests - - name: kubeadm-gce-1.11 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-11 - - name: kubeadm-gce-1.12 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-12 - alert_options: - alert_mail_to_addresses: kubernetes-sig-cluster-lifecycle@googlegroups.com - alert_stale_results_hours: 24 - num_failures_to_alert: 2 # Runs every 12h. Alert when it's been failing for 24 hours - - name: kubeadm-gce-1.13 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-13 - alert_options: - alert_mail_to_addresses: kubernetes-sig-cluster-lifecycle@googlegroups.com - alert_stale_results_hours: 24 - num_failures_to_alert: 2 # Runs every 12h. Alert when it's been failing for 24 hours - - name: kubeadm-gce-1.14 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-14 - alert_options: - alert_mail_to_addresses: kubernetes-sig-cluster-lifecycle@googlegroups.com - alert_stale_results_hours: 24 - num_failures_to_alert: 2 # Runs every 12h. Alert when it's been failing for 24 hours - - name: kubeadm-gce-master - test_group_name: ci-kubernetes-e2e-kubeadm-gce-master - alert_options: - alert_mail_to_addresses: kubernetes-sig-cluster-lifecycle@googlegroups.com - alert_stale_results_hours: 24 - num_failures_to_alert: 6 # Runs every 2h. Alert when it's been failing for 12 hours # kubeadm-kind tests - name: kubeadm-kind-1.12 test_group_name: ci-kubernetes-e2e-kubeadm-kind-1-12 @@ -3889,28 +3862,6 @@ dashboards: test_group_name: ci-kubernetes-e2e-kubeadm-kinder-1-13-on-1-12 - name: kubeadm-kinder-1-12-on-1-11 test_group_name: ci-kubernetes-e2e-kubeadm-kinder-1-12-on-1-11 -# kubeadm x-on-y tests - - name: kubeadm-gce-1.11-on-1.12 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-11-on-1-12 - - name: kubeadm-gce-1.12-on-1.13 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-12-on-1-13 - - name: kubeadm-gce-1.13-on-1.14 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-1-13-on-1-14 - - name: kubeadm-gce-stable-on-master - test_group_name: ci-kubernetes-e2e-kubeadm-gce-stable-on-master - alert_options: - alert_mail_to_addresses: kubernetes-sig-cluster-lifecycle@googlegroups.com - alert_stale_results_hours: 24 - num_failures_to_alert: 4 # Runs every 6h. Alert when it's been failing for 24 hours -# kubeadm upgrade tests - - name: kubeadm-gce-upgrade-1.11-1.12 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-11-1-12 - - name: kubeadm-gce-upgrade-1.12-1.13 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-12-1-13 - - name: kubeadm-gce-1.13-1.14 - test_group_name: ci-kubernetes-e2e-kubeadm-gce-upgrade-1-13-1-14 - - name: kubeadm-gce-upgrade-stable-master - test_group_name: ci-kubernetes-e2e-kubeadm-gce-upgrade-stable-master # packages tests - name: periodic-packages-pushed test_group_name: periodic-kubernetes-e2e-packages-pushed