Merge pull request #12563 from fejta/lab

Run verify-labels in bazel

Author: k8s-ci-robot

Diff for: config/jobs/kubernetes/test-infra/test-infra-presubmits.yaml

@@ -159,25 +159,6 @@ presubmits:
           requests:
             memory: "2Gi"
 
-  - name: pull-test-infra-verify-labels
-    branches:
-    - master
-    run_if_changed: '^label_sync/labels.yaml'
-    decorate: true
-    labels:
-      preset-service-account: "true"
-      preset-bazel-scratch-dir: "true"
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-experimental
-        command:
-        - runner.sh
-        args:
-        - ./hack/verify-labels.sh
-        resources:
-          requests:
-            memory: "2Gi"
-
   - name: pull-test-infra-verify-file-perms
     branches:
     - master

Diff for: hack/BUILD.bazel

@@ -112,6 +112,30 @@ sh_test(
     ],
 )
 
+sh_binary(
+    name = "update-labels",
+    srcs = ["update-labels.sh"],
+    args = ["$(location //label_sync)"],
+    data = ["//label_sync"],
+)
+
+sh_test(
+    name = "verify-labels",
+    srcs = ["verify-labels.sh"],
+    args = [
+        "$(location :update-labels)",
+        "$(location //label_sync)",
+    ],
+    data = [
+        ":update-labels",
+        "//label_sync",
+        "//label_sync:labels.md",
+        "//label_sync:labels.md.tmpl",
+        "//label_sync:labels.yaml",
+    ],
+    tags = ["lint"],
+)
+
 test_suite(
     name = "verify-all",
     tags = ["lint"],  # picks up all non-manual targets with this tag

Diff for: hack/update-labels.sh

@@ -17,13 +17,25 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-TESTINFRA_ROOT=$(git rev-parse --show-toplevel)
-LABELS_CONFIG=${LABELS_CONFIG:-"${TESTINFRA_ROOT}/label_sync/labels.yaml"}
-LABELS_DOCS_TEMPLATE=${LABELS_DOCS_TEMPLATE:-"${TESTINFRA_ROOT}/label_sync/labels.md.tmpl"}
-LABELS_DOCS_OUTPUT=${LABELS_DOCS_OUTPUT:-"${TESTINFRA_ROOT}/label_sync/labels.md"}
+if [[ -n "${BUILD_WORKSPACE_DIRECTORY:-}" ]]; then # Running inside bazel
+  echo "Updating labels..." >&2
+elif ! command -v bazel &>/dev/null; then
+  echo "Install bazel at https://bazel.build" >&2
+  exit 1
+else
+  (
+    set -o xtrace
+    bazel run @io_k8s_test_infra//hack:update-labels
+  )
+  exit 0
+fi
 
-bazel run //label_sync -- \
---config=${LABELS_CONFIG} \
---action=docs \
---docs-template=${LABELS_DOCS_TEMPLATE} \
---docs-output=${LABELS_DOCS_OUTPUT}
+label_sync=$PWD/$1
+cd "$BUILD_WORKSPACE_DIRECTORY"
+out=${2:-label_sync/labels.md}
+
+"$label_sync" \
+    --config=label_sync/labels.yaml \
+    --action=docs \
+    --docs-template=label_sync/labels.md.tmpl \
+    "--docs-output=$out"

Diff for: hack/verify-labels.sh

@@ -17,17 +17,29 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-TESTINFRA_ROOT=$(git rev-parse --show-toplevel)
+if [[ -n "${TEST_WORKSPACE:-}" ]]; then # Running inside bazel
+  echo "Validating labels..." >&2
+elif ! command -v bazel &> /dev/null; then
+  echo "Install bazel at https://bazel.build" >&2
+  exit 1
+else
+  (
+    set -o xtrace
+    bazel test --test_output=streamed @io_k8s_test_infra//hack:verify-labels
+  )
+  exit 0
+fi
 
-TMP_LABELS_DOCS=$(mktemp)
-trap 'rm -f "${TMP_LABELS_DOCS}"' EXIT
-LABELS_DOCS_OUTPUT="${TMP_LABELS_DOCS}" ${TESTINFRA_ROOT}/hack/update-labels.sh
+out=$TEST_TMPDIR/labels.md.expected
+BUILD_WORKSPACE_DIRECTORY="$PWD" "$@" "$out"
 
 
-DIFF=$(diff "${TMP_LABELS_DOCS}" "${TESTINFRA_ROOT}/label_sync/labels.md" || true)
-if [ ! -z "$DIFF" ]; then
-    echo "${DIFF}"
-    echo ""
-    echo "FAILED: labels.yaml was updated without updating labels.md, please run 'hack/update-labels.sh'"
+DIFF=$(diff label_sync/labels.md "$out" || true)
+if [[ -n "$DIFF" ]]; then
+    echo "< unexpected" >&2
+    echo "> missing" >&2
+    echo "${DIFF}" >&2
+    echo "" >&2
+    echo "ERROR: labels.md out of date. Fix with hack/update-labels.sh" >&2
     exit 1
 fi

Diff for: testgrid/config.yaml

@@ -2131,9 +2131,6 @@ test_groups:
 - name: pull-test-infra-verify-deps
   gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-test-infra-verify-deps
   num_columns_recent: 20
-- name: pull-test-infra-verify-labels
-  gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-test-infra-verify-labels
-  num_columns_recent: 20
 - name: pull-test-infra-verify-file-perms
   gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-test-infra-verify-file-perms
   num_columns_recent: 20
@@ -7235,9 +7232,6 @@ dashboards:
   - name: verify-deps
     test_group_name: pull-test-infra-verify-deps
     base_options: width=10
-  - name: verify-labels
-    test_group_name: pull-test-infra-verify-labels
-    base_options: width=10
   - name: verify-codegen
     test_group_name: pull-test-infra-verify-codegen
     base_options: width=10