Merge pull request #18612 from BenTheElder/cleanup-cross

Cleanup cross

config/jobs/kubernetes/sig-release/kubernetes-builds.yaml

@@ -1,23 +1,20 @@
 presubmits:
   kubernetes/kubernetes:
   - name: pull-kubernetes-cross
-    run_if_changed: '^((build\/|hack\/lib\/).*)|(.*Makefile.*)$'
+    optional: true
+    always_run: false
+    decorate: true
     labels:
-      preset-service-account: "true"
       preset-dind-enabled: "true"
     spec:
       containers:
       - image: gcr.io/k8s-testimages/bootstrap:v20200729-ee80a02
+        command:
+        - runner.sh
         args:
-        - "--job=$(JOB_NAME)"
-        - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
-        - "--service-account=/etc/service-account/service-account.json"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - --scenario=execute
-        - --
-        - --env=KUBE_RELEASE_RUN_TESTS=n
         - make
         - release
+        - KUBE_RELEASE_RUN_TESTS=n
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true

config/testgrids/config.yaml

@@ -374,9 +374,6 @@ dashboards:
   - name: pull-kubernetes-dependencies
     test_group_name: pull-kubernetes-dependencies
     base_options: width=10
-  - name: pull-kubernetes-cross
-    test_group_name: pull-kubernetes-cross
-    base_options: width=10
 
 - name: presubmits-kubernetes-nonblocking
   dashboard_tab:
@@ -444,6 +441,9 @@ dashboards:
   - name: pull-kubernetes-e2e-gce-storage-disruptive
     test_group_name: pull-kubernetes-e2e-gce-storage-disruptive
     base_options: width=10
+  - name: pull-kubernetes-cross
+    test_group_name: pull-kubernetes-cross
+    base_options: width=10
 
 - name: presubmits-cloud-provider-vsphere-blocking
 - name: vmware-presubmits-cloud-provider-vsphere