sig-node: Fix testgrid annotations and suffixes for node-kubelet jobs

Signed-off-by: Stephen Augustus <[email protected]>

config/jobs/kubernetes/sig-node/node-kubelet.yaml

@@ -4,7 +4,7 @@ periodics:
   annotations:
     fork-per-release: "true"
     fork-per-release-periodic-interval: 1h 2h 6h 24h
-    fork-per-release-generic-suffix: "true"
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-release-master-blocking, sig-node-kubelet
     testgrid-tab-name: node-kubelet-master
     testgrid-alert-email: [email protected]
@@ -60,10 +60,11 @@ periodics:
       env:
       - name: GOPATH
         value: /go
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-alpha
+
 - name: ci-kubernetes-node-kubelet-benchmark
   interval: 2h
   labels:
@@ -90,10 +91,11 @@ periodics:
       env:
       - name: GOPATH
         value: /go
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-benchmark
+
 - name: ci-kubernetes-node-kubelet-conformance
   interval: 2h
   labels:
@@ -124,18 +126,19 @@ periodics:
       # docker-in-docker needs privileged mode
       securityContext:
         privileged: true
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-conformance
+
 - name: ci-kubernetes-node-kubelet-features
   interval: 1h
   labels:
     preset-service-account: "true"
     preset-k8s-ssh: "true"
   annotations:
     fork-per-release: "true"
-    fork-per-release-generic-suffix: "true"
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet, sig-release-master-informing
     testgrid-tab-name: node-kubelet-features
   spec:
@@ -186,10 +189,11 @@ periodics:
       env:
       - name: GOPATH
         value: /go
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-flaky
+
 - name: ci-kubernetes-node-kubelet-orphans
   interval: 12h
   labels:
@@ -216,10 +220,11 @@ periodics:
       env:
       - name: GOPATH
         value: /go
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-orphans
+
 - name: ci-kubernetes-node-kubelet-serial
   interval: 4h30m
   labels:
@@ -246,10 +251,11 @@ periodics:
       env:
       - name: GOPATH
         value: /go
-
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-serial
+
 - name: ci-kubernetes-node-kubelet-serial-alpha
   interval: 3h30m
   labels:
@@ -279,6 +285,7 @@ periodics:
   annotations:
     testgrid-dashboards: sig-node-kubelet
     testgrid-tab-name: node-kubelet-serial-alpha
+
 - name: ci-kubernetes-node-kubelet-serial-cpu-manager
   interval: 4h
   labels:
@@ -306,6 +313,7 @@ periodics:
       - name: GOPATH
         value: /go
   annotations:
+    testgrid-create-test-group: "true"
     testgrid-dashboards: wg-resource-management
     testgrid-tab-name: kubelet-serial-gce-e2e-cpu-manager
     testgrid-alert-email: [email protected], [email protected]

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

@@ -60,16 +60,16 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
     fork-per-release-periodic-interval: ""
     testgrid-alert-email: [email protected]
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-release-1.15-blocking, sig-node-kubelet
     testgrid-tab-name: node-kubelet-1.15
   interval: 24h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-stable3
+  name: ci-kubernetes-node-kubelet-1-15
   spec:
     containers:
     - args:
@@ -94,13 +94,14 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet, sig-release-1.15-informing
+    testgrid-tab-name: node-kubelet-features-1.15
   interval: 1h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-features-stable3
+  name: ci-kubernetes-node-kubelet-features-1-15
   spec:
     containers:
     - args:

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

@@ -60,16 +60,16 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
     fork-per-release-periodic-interval: 24h
     testgrid-alert-email: [email protected]
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-release-1.16-blocking, sig-node-kubelet
     testgrid-tab-name: node-kubelet-1.16
   interval: 6h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-stable2
+  name: ci-kubernetes-node-kubelet-1-16
   spec:
     containers:
     - args:
@@ -94,14 +94,14 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet, sig-release-1.16-informing
-    testgrid-tab-name: node-kubelet-features-stable1
+    testgrid-tab-name: node-kubelet-features-1.16
   interval: 1h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-features-stable2
+  name: ci-kubernetes-node-kubelet-features-1-16
   spec:
     containers:
     - args:

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

@@ -95,16 +95,16 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
     fork-per-release-periodic-interval: 6h 24h
     testgrid-alert-email: [email protected]
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-release-1.17-blocking, sig-node-kubelet
     testgrid-tab-name: node-kubelet-1.17
   interval: 2h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-stable1
+  name: ci-kubernetes-node-kubelet-1-17
   spec:
     containers:
     - args:
@@ -129,14 +129,14 @@ periodics:
       name: ""
       resources: {}
 - annotations:
-    fork-per-release-generic-suffix: "true"
+    testgrid-create-test-group: "true"
     testgrid-dashboards: sig-node-kubelet, sig-release-1.17-informing
-    testgrid-tab-name: node-kubelet-features-beta
+    testgrid-tab-name: node-kubelet-features-1.17
   interval: 1h
   labels:
     preset-k8s-ssh: "true"
     preset-service-account: "true"
-  name: ci-kubernetes-node-kubelet-features-stable1
+  name: ci-kubernetes-node-kubelet-features-1-17
   spec:
     containers:
     - args:

config/testgrids/config.yaml

@@ -6,48 +6,6 @@
 
 # Start testgroups
 test_groups:
-- name: ci-kubernetes-node-kubelet-benchmark
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-benchmark
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-features
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-features
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-orphans
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-orphans
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-serial
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-serial-cpu-manager
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-serial-cpu-manager
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
 - name: ci-cri-containerd-node-e2e
   gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-node-e2e
   test_name_config:
@@ -141,62 +99,6 @@ test_groups:
   days_of_results: 60
   num_columns_recent: 3
   num_failures_to_alert: 1
-- name: ci-kubernetes-node-kubelet-flaky
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-flaky
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-conformance
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-conformance
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-alpha
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-alpha
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-beta
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-beta
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-features-beta
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-features-beta
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-stable1
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-stable1
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-stable2
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-stable2
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
-- name: ci-kubernetes-node-kubelet-stable3
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-stable3
-  test_name_config:
-    name_elements:
-    - target_config: Tests name
-    - target_config: Context
-    name_format: '%s [%s]'
 
 # Canonical Distribution of Kubernetes (contact: @chuckbutler on github)
 - name: canonical-kubernetes-e2e-gce