From 41e376e55d3f0bfd430a5eada11cf1aa6dad95f9 Mon Sep 17 00:00:00 2001 From: Erick Fejta Date: Mon, 31 Jul 2017 00:42:43 -0700 Subject: [PATCH] Delete gce-latest-upgrade-cluster and gke-stackdriver --- ...ernetes-e2e-gce-latest-upgrade-cluster.env | 8 --- jobs/ci-kubernetes-e2e-gke-stackdriver.env | 5 -- jobs/config.json | 38 ----------- prow/config.yaml | 65 ------------------- testgrid/config/config.yaml | 12 ---- 5 files changed, 128 deletions(-) delete mode 100644 jobs/ci-kubernetes-e2e-gce-latest-upgrade-cluster.env delete mode 100644 jobs/ci-kubernetes-e2e-gke-stackdriver.env diff --git a/jobs/ci-kubernetes-e2e-gce-latest-upgrade-cluster.env b/jobs/ci-kubernetes-e2e-gce-latest-upgrade-cluster.env deleted file mode 100644 index bca988ed419a..000000000000 --- a/jobs/ci-kubernetes-e2e-gce-latest-upgrade-cluster.env +++ /dev/null @@ -1,8 +0,0 @@ -### job-env - -STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf -KUBE_NODE_OS_DISTRIBUTION=debian - - -# Enable when testing upgrades from a version < 1.6 to a version >= 1.6 -ENABLE_LEGACY_ABAC=true diff --git a/jobs/ci-kubernetes-e2e-gke-stackdriver.env b/jobs/ci-kubernetes-e2e-gke-stackdriver.env deleted file mode 100644 index 6b3cf3334477..000000000000 --- a/jobs/ci-kubernetes-e2e-gke-stackdriver.env +++ /dev/null @@ -1,5 +0,0 @@ -### job-env -CLOUDSDK_CONTAINER_USE_CLIENT_CERTIFICATE=False - -STACKDRIVER_API_ENDPOINT_OVERRIDE=https://test-monitoring.sandbox.googleapis.com/ - diff --git a/jobs/config.json b/jobs/config.json index 23d58612d504..4ee87c6d4761 100644 --- a/jobs/config.json +++ b/jobs/config.json @@ -2516,26 +2516,6 @@ "sig-scale" ] }, - "ci-kubernetes-e2e-gce-latest-upgrade-cluster": { - "args": [ - "--check-leaked-resources", - "--check-version-skew=false", - "--env-file=jobs/platform/gce.env", - "--env-file=jobs/ci-kubernetes-e2e-gce-latest-upgrade-cluster.env", - "--extract=ci/latest", - "--extract=ci/latest-1.6", - "--gcp-project=kube-gce-upg-lat-cluster", - "--gcp-zone=us-central1-f", - "--provider=gce", - "--skew", - "--test_args=--ginkgo.focus=\\[Feature:ClusterUpgrade\\] --upgrade-target=ci/latest --minStartupPods=8", - "--timeout=90m" - ], - "scenario": "kubernetes_e2e", - "sigOwners": [ - "UNKNOWN" - ] - }, "ci-kubernetes-e2e-gce-latest-upgrade-master": { "args": [ "--check-leaked-resources", @@ -7232,24 +7212,6 @@ "UNKNOWN" ] }, - "ci-kubernetes-e2e-gke-stackdriver": { - "args": [ - "--check-leaked-resources", - "--env-file=jobs/platform/gke.env", - "--env-file=jobs/ci-kubernetes-e2e-gke-stackdriver.env", - "--extract=ci/latest", - "--gcp-cloud-sdk=gs://cloud-sdk-testing/ci/staging", - "--gcp-project=k8s-jkns-e2e-gke-stackdriver", - "--gcp-zone=us-central1-f", - "--provider=gke", - "--test_args=--ginkgo.focus=\\[Feature:StackdriverMonitoring\\] --minStartupPods=8", - "--timeout=50m" - ], - "scenario": "kubernetes_e2e", - "sigOwners": [ - "UNKNOWN" - ] - }, "ci-kubernetes-e2e-gke-staging": { "args": [ "--check-leaked-resources", diff --git a/prow/config.yaml b/prow/config.yaml index 8d89e7475267..d29b9e89740b 100644 --- a/prow/config.yaml +++ b/prow/config.yaml @@ -5045,39 +5045,6 @@ periodics: secret: defaultMode: 256 secretName: ssh-key-secret -- interval: 2h - name: ci-kubernetes-e2e-gce-latest-upgrade-cluster - spec: - containers: - - args: - - --timeout=110 - - --bare - env: - - name: GOOGLE_APPLICATION_CREDENTIALS - value: /etc/service-account/service-account.json - - name: USER - value: prow - - name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE - value: /etc/ssh-key-secret/ssh-private - - name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE - value: /etc/ssh-key-secret/ssh-public - image: gcr.io/k8s-testimages/kubekins-e2e-prow:v20170728-e1f1ad9b - volumeMounts: - - mountPath: /etc/service-account - name: service - readOnly: true - - mountPath: /etc/ssh-key-secret - name: ssh - readOnly: true - volumes: - - name: service - secret: - secretName: service-account - - name: ssh - secret: - defaultMode: 256 - secretName: ssh-key-secret - - interval: 2h name: ci-kubernetes-e2e-gce-latest-upgrade-master spec: @@ -12758,38 +12725,6 @@ periodics: defaultMode: 256 secretName: ssh-key-secret -- interval: 30m - name: ci-kubernetes-e2e-gke-stackdriver - spec: - containers: - - args: - - --timeout=70 - - --bare - env: - - name: GOOGLE_APPLICATION_CREDENTIALS - value: /etc/service-account/service-account.json - - name: USER - value: prow - - name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE - value: /etc/ssh-key-secret/ssh-private - - name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE - value: /etc/ssh-key-secret/ssh-public - image: gcr.io/k8s-testimages/kubekins-e2e-prow:v20170728-e1f1ad9b - volumeMounts: - - mountPath: /etc/service-account - name: service - readOnly: true - - mountPath: /etc/ssh-key-secret - name: ssh - readOnly: true - volumes: - - name: service - secret: - secretName: service-account - - name: ssh - secret: - defaultMode: 256 - secretName: ssh-key-secret - interval: 30m name: ci-kubernetes-e2e-gke-staging spec: diff --git a/testgrid/config/config.yaml b/testgrid/config/config.yaml index 6b45af0bf003..098fcac8ffb7 100644 --- a/testgrid/config/config.yaml +++ b/testgrid/config/config.yaml @@ -314,8 +314,6 @@ test_groups: gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-autoscaling - name: ci-kubernetes-e2e-gci-gke-autoscaling gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gke-autoscaling -- name: ci-kubernetes-e2e-gke-stackdriver - gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-stackdriver - name: ci-kubernetes-e2e-gke-flaky gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-flaky - name: ci-kubernetes-e2e-gci-gke-flaky @@ -897,8 +895,6 @@ test_groups: - name: ci-kubernetes-e2e-kubeadm-gce-1-6-on-1-7 gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kubeadm-gce-1-6-on-1-7 # upgrade CI tests -- name: ci-kubernetes-e2e-gce-latest-upgrade-cluster - gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-upgrade-cluster - name: ci-kubernetes-e2e-gce-latest-upgrade-master gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-upgrade-master - name: ci-kubernetes-e2e-gke-latest-upgrade-cluster @@ -1759,8 +1755,6 @@ dashboards: test_group_name: ci-kubernetes-e2e-gke-alpha-features - name: gci-gke-alpha-features test_group_name: ci-kubernetes-e2e-gci-gke-alpha-features - - name: gke-stackdriver - test_group_name: ci-kubernetes-e2e-gke-stackdriver - name: gke-flaky test_group_name: ci-kubernetes-e2e-gke-flaky - name: gci-gke-flaky @@ -2133,8 +2127,6 @@ dashboards: - name: latest-upgrades dashboard_tab: - name: gce-cluster - test_group_name: ci-kubernetes-e2e-gce-latest-upgrade-cluster - - name: gce-master test_group_name: ci-kubernetes-e2e-gce-latest-upgrade-master - name: gke-cluster test_group_name: ci-kubernetes-e2e-gke-latest-upgrade-cluster @@ -3329,10 +3321,6 @@ dashboards: test_group_name: ci-kubernetes-e2e-gce-stackdriver base_options: 'include-filter-by-regex=sig-instrumentation' description: 'sig-instrumentation gce stackdriver monitoring e2e tests for master branch' - - name: gke-sd-monitoring - test_group_name: ci-kubernetes-e2e-gke-stackdriver - base_options: 'include-filter-by-regex=sig-instrumentation' - description: 'sig-instrumentation gke stackdriver monitoring e2e tests for master branch' - name: sig-network dashboard_tab: