Remove kubemark-5 presubmit+canary - update with newer scalability pr…

…esubmits
gajanankulkarni-18 · Jun 18, 2018 · d7d6f89 · d7d6f89
1 parent 5bc7b15
commit d7d6f89
Show file tree

Hide file tree

Showing 9 changed files with 359 additions and 1,177 deletions.
diff --git a/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml b/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml
@@ -27,7 +27,6 @@ config:
     pull-kubernetes-unit,\
     pull-kubernetes-verify,\
     pull-kubernetes-node-e2e,\
-    pull-kubernetes-kubemark-e2e-gce,\
     pull-kubernetes-e2e-gce-etcd3,\
     pull-kubernetes-bazel-build,\
     pull-kubernetes-bazel-test,\

diff --git a/gubernator/config.yaml b/gubernator/config.yaml
@@ -33,7 +33,6 @@ jobs:
   - pull-kubernetes-e2e-gce-device-plugin-gpu
   - pull-kubernetes-e2e-kops-aws
   - pull-kubernetes-integration
-  - pull-kubernetes-kubemark-e2e-gce
   - pull-kubernetes-kubemark-e2e-gce-big
   - pull-kubernetes-node-e2e
   - pull-kubernetes-typecheck

diff --git a/jobs/config.json b/jobs/config.json
@@ -13204,30 +13204,6 @@
       "sig-testing"
     ]
   },
-  "pull-kubernetes-kubemark-e2e-gce": {
-    "args": [
-      "--build=bazel",
-      "--cluster=",
-      "--env-file=jobs/env/ci-kubernetes-e2e-kubemark-common.env",
-      "--extract=local",
-      "--gcp-node-image=gci",
-      "--gcp-node-size=n1-standard-2",
-      "--gcp-nodes=1",
-      "--gcp-project=k8s-jkns-pr-kubemark",
-      "--gcp-zone=us-central1-f",
-      "--kubemark",
-      "--kubemark-nodes=5",
-      "--provider=gce",
-      "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce",
-      "--test=false",
-      "--test_args=--ginkgo.focus=\\[Feature:Empty\\] --gather-resource-usage=true",
-      "--timeout=60m"
-    ],
-    "scenario": "kubernetes_e2e",
-    "sigOwners": [
-      "sig-scalability"
-    ]
-  },
   "pull-kubernetes-kubemark-e2e-gce-big": {
     "args": [
       "--build",
@@ -13254,30 +13230,6 @@
       "sig-scalability"
     ]
   },
-  "pull-kubernetes-kubemark-e2e-gce-canary": {
-    "args": [
-      "--build=bazel",
-      "--cluster=",
-      "--env-file=jobs/env/ci-kubernetes-e2e-kubemark-common.env",
-      "--extract=local",
-      "--gcp-node-image=gci",
-      "--gcp-node-size=n1-standard-2",
-      "--gcp-nodes=1",
-      "--gcp-project=k8s-jkns-pr-kubemark",
-      "--gcp-zone=us-central1-f",
-      "--kubemark",
-      "--kubemark-nodes=5",
-      "--provider=gce",
-      "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce-canary",
-      "--test=false",
-      "--test_args=--ginkgo.focus=\\[Feature:Empty\\] --gather-resource-usage=true",
-      "--timeout=60m"
-    ],
-    "scenario": "kubernetes_e2e",
-    "sigOwners": [
-      "sig-scalability"
-    ]
-  },
   "pull-kubernetes-kubemark-e2e-gce-scale": {
     "args": [
       "--build",

diff --git a/jobs/config_test.py b/jobs/config_test.py
@@ -585,9 +585,6 @@ def test_all_project_are_unique(self):
             'ci-kubernetes-e2e-gci-gce-autoscaling-hpa':'ci-kubernetes-e2e-gci-gce-autoscaling',
             'ci-kubernetes-e2e-gci-gce-autoscaling-migs-hpa':'ci-kubernetes-e2e-gci-gce-autoscaling-migs',
             'ci-kubernetes-e2e-gci-gke-autoscaling-hpa':'ci-kubernetes-e2e-gci-gke-autoscaling',
-            # kubemark presubmits
-            'pull-kubernetes-kubemark-e2e-gce-canary':'k8s-jkns-pr-kubemark',
-            'pull-kubernetes-kubemark-e2e-gce':'k8s-jkns-pr-kubemark',
             # gpu+autoscaling jobs intentionally share projects with gpu tests
             'ci-kubernetes-e2e-gci-gke-autoscaling-gpu-v100': 'ci-kubernetes-e2e-gke-staging-latest-device-plugin-gpu-v100',
         }

diff --git a/maintenance/migratestatus/migrate-many.sh b/maintenance/migratestatus/migrate-many.sh
@@ -36,7 +36,6 @@ bazel build //maintenance/migratestatus || exit 1
 #migrate "Gubernator tests" pull-test-infra-gubernator
 #migrate "verify-bazel" pull-test-infra-verify-bazel
 
-migrate "Jenkins Kubemark GCE e2e" pull-kubernetes-kubemark-e2e-gce
 migrate "Jenkins GCE etcd3 e2e" pull-kubernetes-e2e-gce-etcd3
 migrate "Jenkins kops AWS e2e" pull-kubernetes-e2e-kops-aws
 migrate "Jenkins unit/integration" pull-kubernetes-unit

diff --git a/metrics/configs/pr-consistency-config.yaml b/metrics/configs/pr-consistency-config.yaml
@@ -42,9 +42,10 @@ query: |
             'pr:pull-kubernetes-bazel-build',
             'pr:pull-kubernetes-bazel-test',
             'pr:pull-kubernetes-e2e-gce',
+            'pr:pull-kubernetes-e2e-gce-100-performance',
             'pr:pull-kubernetes-e2e-kops-aws',
             'pr:pull-kubernetes-integration',
-            'pr:pull-kubernetes-kubemark-e2e-gce',
+            'pr:pull-kubernetes-kubemark-e2e-gce-big',
             'pr:pull-kubernetes-node-e2e',
             'pr:pull-kubernetes-typecheck',
             'pr:pull-kubernetes-verify',

diff --git a/metrics/configs/weekly-consistency-config.yaml b/metrics/configs/weekly-consistency-config.yaml
@@ -39,9 +39,10 @@ query: |
             'pr:pull-kubernetes-bazel-build',
             'pr:pull-kubernetes-bazel-test',
             'pr:pull-kubernetes-e2e-gce',
+            'pr:pull-kubernetes-e2e-gce-100-performance',
             'pr:pull-kubernetes-e2e-kops-aws',
             'pr:pull-kubernetes-integration',
-            'pr:pull-kubernetes-kubemark-e2e-gce',
+            'pr:pull-kubernetes-kubemark-e2e-gce-big',
             'pr:pull-kubernetes-node-e2e',
             'pr:pull-kubernetes-typecheck',
             'pr:pull-kubernetes-verify',