Migrate kubernetes merge-blocking scalability presubmits to k8s-infra

config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml

@@ -915,6 +915,7 @@ presubmits:
   - always_run: true
     branches:
     - release-1.16
+    cluster: k8s-infra-prow-build
     labels:
       preset-bazel-scratch-dir: "true"
       preset-e2e-scalability-common: "true"
@@ -939,7 +940,7 @@ presubmits:
         - --extract=local
         - --flush-mem-after-build=true
         - --gcp-nodes=100
-        - --gcp-project-type=scalability-presubmit-project
+        - --gcp-project-type=scalability-project
         - --gcp-zone=us-east1-b
         - --provider=gce
         - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance

config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml

@@ -976,6 +976,7 @@ presubmits:
   - always_run: true
     branches:
     - release-1.17
+    cluster: k8s-infra-prow-build
     labels:
       preset-bazel-scratch-dir: "true"
       preset-e2e-scalability-common: "true"
@@ -1000,7 +1001,7 @@ presubmits:
         - --extract=local
         - --flush-mem-after-build=true
         - --gcp-nodes=100
-        - --gcp-project-type=scalability-presubmit-project
+        - --gcp-project-type=scalability-project
         - --gcp-zone=us-east1-b
         - --provider=gce
         - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance

config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml

@@ -1177,6 +1177,7 @@ presubmits:
   - always_run: true
     branches:
     - release-1.18
+    cluster: k8s-infra-prow-build
     labels:
       preset-bazel-scratch-dir: "true"
       preset-e2e-scalability-common: "true"
@@ -1201,7 +1202,7 @@ presubmits:
         - --extract=local
         - --flush-mem-after-build=true
         - --gcp-nodes=100
-        - --gcp-project-type=scalability-presubmit-project
+        - --gcp-project-type=scalability-project
         - --gcp-zone=us-east1-b
         - --provider=gce
         - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance

config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml

@@ -1128,6 +1128,7 @@ presubmits:
   - always_run: true
     branches:
     - release-1.19
+    cluster: k8s-infra-prow-build
     labels:
       preset-bazel-scratch-dir: "true"
       preset-e2e-scalability-common: "true"
@@ -1153,7 +1154,7 @@ presubmits:
         - --extract=local
         - --flush-mem-after-build=true
         - --gcp-nodes=100
-        - --gcp-project-type=scalability-presubmit-project
+        - --gcp-project-type=scalability-project
         - --gcp-zone=us-east1-b
         - --provider=gce
         - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance

config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml

@@ -1,6 +1,7 @@
 presubmits:
   kubernetes/kubernetes:
   - name: pull-kubernetes-e2e-gce-100-performance
+    cluster: k8s-infra-prow-build
     always_run: true
     skip_report: false
     max_concurrency: 12
@@ -15,76 +16,6 @@ presubmits:
       preset-e2e-scalability-presubmits: "true"
     annotations:
       fork-per-release: "true"
-    spec:
-      containers:
-      - args:
-        - --root=/go/src
-        - --repo=k8s.io/kubernetes=$(PULL_REFS)
-        - --repo=k8s.io/perf-tests=master
-        - --repo=k8s.io/release
-        - --upload=gs://kubernetes-jenkins/pr-logs
-        - --timeout=120
-        - --scenario=kubernetes_e2e
-        - --
-        - --build=bazel
-        - --cluster=
-        - --extract=local
-        - --flush-mem-after-build=true
-        - --gcp-nodes=100
-        # TODO(k/k#94098): Remove the line below once we get enough data.
-        - --gcp-master-size=n1-standard-8
-        - --gcp-project-type=scalability-presubmit-project
-        - --gcp-zone=us-east1-b
-        - --provider=gce
-        - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance
-        - --tear-down-previous
-        - --env=CL2_ENABLE_VIOLATIONS_FOR_SCHEDULING_THROUGHPUT=false
-        - --test=false
-        - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh
-        - --test-cmd-args=cluster-loader2
-        - --test-cmd-args=--nodes=100
-        - --test-cmd-args=--provider=gce
-        - --test-cmd-args=--report-dir=/workspace/_artifacts
-        - --test-cmd-args=--testconfig=testing/density/config.yaml
-        - --test-cmd-args=--testconfig=testing/load/config.yaml
-        - --test-cmd-args=--testconfig=testing/access-tokens/config.yaml
-        - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml
-        - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml
-        - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml
-        - --test-cmd-args=--testoverrides=./testing/overrides/load_throughput.yaml
-        - --test-cmd-name=ClusterLoaderV2
-        - --timeout=100m
-        - --use-logexporter
-        image: gcr.io/k8s-testimages/kubekins-e2e:v20200827-e0bb92b-master
-        resources:
-          # Using 6 CPU to speed up bazel build phase (2 is enough for the test itself)
-          limits:
-            cpu: 6
-            memory: "14Gi"
-          requests:
-            cpu: 6
-            memory: "14Gi"
-
-  # copy of pull-kuberentes-e2e-gce-100-performance to verify whether
-  # k8s-infra-prow-build's scalability-project pool is able to run this job
-  - name: pull-kubernetes-e2e-gce-100-performance-canary
-    cluster: k8s-infra-prow-build
-    always_run: false
-    skip_report: false
-    max_concurrency: 1
-    skip_branches:
-    - release-\d+\.\d+  # per-release image
-    labels:
-      preset-service-account: "true"
-      preset-k8s-ssh: "true"
-      preset-bazel-scratch-dir: "true"
-      preset-e2e-scalability-common: "true"
-      preset-e2e-scalability-containerd: "true"
-      preset-e2e-scalability-presubmits: "true"
-    annotations:
-      testgrid-dashboards: sig-testing-canaries
-      testgrid-tab-name: gce-100-canary
-      testgrid-create-test-group: "true"
     spec:
       containers:
       - args:
@@ -196,6 +127,7 @@ presubmits:
   # at 100 node scale. It's an optional presubmit to simplify testing changes
   # that affect the releasing blocking ci correctness tests.
   - name: pull-kubernetes-e2e-gce-correctness
+    cluster: k8s-infra-prow-build
     always_run: false
     optional: true
     labels:
@@ -224,7 +156,7 @@ presubmits:
         - --gcp-node-image=gci
         - --gcp-node-size=g1-small
         - --gcp-nodes=100
-        - --gcp-project-type=scalability-presubmit-project
+        - --gcp-project-type=scalability-project
         - --gcp-ssh-proxy-instance-name=gce-cluster-master
         - --gcp-zone=us-east1-b
         - --ginkgo-parallel=40
@@ -378,6 +310,87 @@ presubmits:
         securityContext:
           privileged: true # TODO(fejta): https://github.com/kubernetes/kubernetes/issues/76484
 
+  # copy-paste of pull-kubernetes-kubemark-e2e-gce-big modified to try running
+  # on k8s-infra-prow-build with scalability-project instead of scalability-presubmit-project
+  - name: pull-kubernetes-kubemark-e2e-gce-big-canary
+    always_run: false
+    optional: true
+    skip_report: false
+    max_concurrency: 12
+    skip_branches:
+    - release-\d+\.\d+  # per-release image
+    labels:
+      preset-service-account: "true"
+      preset-k8s-ssh: "true"
+      preset-bazel-scratch-dir: "true"
+      preset-dind-enabled: "true"
+      preset-e2e-kubemark-common: "true"
+      preset-e2e-scalability-presubmits: "true"
+    annotations:
+      testgrid-dashboards: sig-testing-canaries
+      testgrid-tab-name: kubemark-canary
+      testgrid-create-test-group: "true"
+    spec:
+      containers:
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200827-e0bb92b-master
+        args:
+        - --root=/go/src
+        - "--job=$(JOB_NAME)"
+        - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
+        - "--repo=k8s.io/perf-tests=master"
+        - "--repo=k8s.io/release"
+        - "--service-account=/etc/service-account/service-account.json"
+        - "--upload=gs://kubernetes-jenkins/pr-logs"
+        - "--timeout=120"
+        - --scenario=kubernetes_e2e
+        - --
+        - --build=bazel
+        - --cluster=
+        - --extract=local
+        - --flush-mem-after-build=true
+        - --gcp-master-size=n1-standard-4
+        - --gcp-node-size=n1-standard-8
+        - --gcp-nodes=7
+        - --gcp-project-type=scalability-project
+        - --gcp-zone=us-east1-b
+        - --kubemark
+        - --kubemark-nodes=500
+        - --provider=gce
+        - --stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce-big-canary
+        - --tear-down-previous
+        - --test=false
+        - --test_args=--ginkgo.focus=xxxx
+        - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh
+        - --test-cmd-args=cluster-loader2
+        - --test-cmd-args=--nodes=500
+        - --test-cmd-args=--provider=kubemark
+        - --env=CL2_ENABLE_PVS=false # TODO(https://github.com/kubernetes/perf-tests/issues/803): Fix me
+        - --test-cmd-args=--report-dir=/workspace/_artifacts
+        - --test-cmd-args=--testconfig=testing/density/config.yaml
+        - --test-cmd-args=--testconfig=testing/load/config.yaml
+        - --test-cmd-args=--testconfig=testing/access-tokens/config.yaml
+        - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml
+        - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml
+        - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml
+        - --test-cmd-args=--testoverrides=./testing/overrides/kubemark_500_nodes.yaml
+        - --test-cmd-name=ClusterLoaderV2
+        - --timeout=100m
+        - --use-logexporter
+        # TODO(krzyzacy): Figure out bazel built kubemark image
+        #env:
+        # - name: KUBEMARK_BAZEL_BUILD
+        # value: "y"
+        resources:
+          limits:
+            # Using 6 CPU to speed up bazel build phase (4 is enough for the test itself)
+            cpu: 6
+            memory: 16Gi
+          requests:
+            cpu: 6
+            memory: 16Gi
+        securityContext:
+          privileged: true # TODO(fejta): https://github.com/kubernetes/kubernetes/issues/76484
+
   - name: pull-kubernetes-kubemark-e2e-gce-scale
     always_run: false
     max_concurrency: 1