From c81bf38940c9ff1abb76ffa26e777fbf16bc3e81 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Tue, 11 May 2021 13:55:37 +0530 Subject: [PATCH 01/12] added prow job for depstat Signed-off-by: RinkiyaKeDad --- .../sig-arch/kubernetes-depstat.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml new file mode 100644 index 000000000000..c3844fefc151 --- /dev/null +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -0,0 +1,24 @@ +presubmits: + kubernetes/kubernetes: + - name: kubernetes-depstat + decorate: true + always_run: true + skip_report: true + spec: + containers: + - image: golang + command: ["/bin/bash"] + args: ["-c", "apk update; apk add git; + set -euo; + BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-tmp/artifacts}"; + mkdir -p "${ARTIFACTS}"; + export GO111MODULE=on; + go get github.com/kubernetes-sigs/depstat; + function write_report() { depstat stats --json }; + function diff_reports() { diff $1 $2 }; + write_report > "${ARTIFACTS}/stats.json"; + if [ -n "${BASE_SHA}" ]; then; + git checkout -b base "${BASE_SHA}"; + write_report > "${ARTIFACTS}/stats-base.json"; + diff_reports "${ARTIFACTS}"/report{-base}.json; + fi;"] From 44253087c9230f71d48faa8695bdbb2b88f560a1 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Tue, 11 May 2021 19:19:53 +0530 Subject: [PATCH 02/12] go get -> go install Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index c3844fefc151..6cdef05b85be 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -13,7 +13,7 @@ presubmits: BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-tmp/artifacts}"; mkdir -p "${ARTIFACTS}"; export GO111MODULE=on; - go get github.com/kubernetes-sigs/depstat; + go install github.com/kubernetes-sigs/depstat; function write_report() { depstat stats --json }; function diff_reports() { diff $1 $2 }; write_report > "${ARTIFACTS}/stats.json"; From f9c651abd2845ae563906c5a85e6b792870a3431 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Wed, 12 May 2021 18:30:34 +0530 Subject: [PATCH 03/12] working locally Signed-off-by: RinkiyaKeDad --- .../sig-arch/kubernetes-depstat.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 6cdef05b85be..8e55622d4b8b 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -8,17 +8,17 @@ presubmits: containers: - image: golang command: ["/bin/bash"] - args: ["-c", "apk update; apk add git; - set -euo; - BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-tmp/artifacts}"; + args: ["-c", "set -euo; + BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; mkdir -p "${ARTIFACTS}"; - export GO111MODULE=on; - go install github.com/kubernetes-sigs/depstat; - function write_report() { depstat stats --json }; - function diff_reports() { diff $1 $2 }; + cd $ARTIFACTS + go install github.com/kubernetes-sigs/depstat@latest; + cd /go/src/k8s.io/kubernetes + function write_report() { depstat stats --json; }; + function diff_reports() { diff $1 $2; }; write_report > "${ARTIFACTS}/stats.json"; - if [ -n "${BASE_SHA}" ]; then; + if [ -n "${BASE_SHA}" ]; then git checkout -b base "${BASE_SHA}"; write_report > "${ARTIFACTS}/stats-base.json"; - diff_reports "${ARTIFACTS}"/report{-base}.json; + diff_reports "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json; fi;"] From 77628b089a9ef49454009e2a53ea5bc21d2644d0 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Wed, 12 May 2021 21:49:33 +0530 Subject: [PATCH 04/12] fix shell errors Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 8e55622d4b8b..6d2ea5200db9 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -11,11 +11,11 @@ presubmits: args: ["-c", "set -euo; BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; mkdir -p "${ARTIFACTS}"; - cd $ARTIFACTS + cd "$ARTIFACTS" go install github.com/kubernetes-sigs/depstat@latest; cd /go/src/k8s.io/kubernetes function write_report() { depstat stats --json; }; - function diff_reports() { diff $1 $2; }; + function diff_reports() { diff "$1" "$2"; }; write_report > "${ARTIFACTS}/stats.json"; if [ -n "${BASE_SHA}" ]; then git checkout -b base "${BASE_SHA}"; From 04928e9281de8a7b3adf9fc43b11b4e8e0411f28 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Thu, 13 May 2021 11:33:30 +0530 Subject: [PATCH 05/12] fix arg specifying method Signed-off-by: RinkiyaKeDad --- .../sig-arch/kubernetes-depstat.yaml | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 6d2ea5200db9..0924ca34afe1 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -8,17 +8,21 @@ presubmits: containers: - image: golang command: ["/bin/bash"] - args: ["-c", "set -euo; - BASE_SHA="${PULL_BASE_SHA:-""}"; ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; - mkdir -p "${ARTIFACTS}"; - cd "$ARTIFACTS" - go install github.com/kubernetes-sigs/depstat@latest; - cd /go/src/k8s.io/kubernetes - function write_report() { depstat stats --json; }; - function diff_reports() { diff "$1" "$2"; }; - write_report > "${ARTIFACTS}/stats.json"; - if [ -n "${BASE_SHA}" ]; then - git checkout -b base "${BASE_SHA}"; - write_report > "${ARTIFACTS}/stats-base.json"; - diff_reports "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json; - fi;"] + args: + - -c + - | + set -euo \ + BASE_SHA="${PULL_BASE_SHA:-""}" \ + ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}" \ + mkdir -p "${ARTIFACTS}" \ + cd "$ARTIFACTS" \ + go install github.com/kubernetes-sigs/depstat@latest \ + cd /go/src/k8s.io/kubernetes \ + function write_report() { depstat stats --json; } \ + function diff_reports() { diff "$1" "$2"; } \ + write_report > "${ARTIFACTS}/stats.json" \ + if [ -n "${BASE_SHA}" ]; then \ + git checkout -b base "${BASE_SHA}" \ + write_report > "${ARTIFACTS}/stats-base.json" \ + diff_reports "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json \ + fi \ From 8a27d9b59c5c525bfdebd20294669f0af6addfb7 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Thu, 13 May 2021 17:06:52 +0530 Subject: [PATCH 06/12] removed '\' at the end Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 0924ca34afe1..0739fbfc2ab4 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -25,4 +25,4 @@ presubmits: git checkout -b base "${BASE_SHA}" \ write_report > "${ARTIFACTS}/stats-base.json" \ diff_reports "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json \ - fi \ + fi From 0ae55e021d89351883494d9b6b9ae73b17eca258 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Thu, 13 May 2021 18:54:30 +0530 Subject: [PATCH 07/12] partly working locally Signed-off-by: RinkiyaKeDad --- .../sig-arch/kubernetes-depstat.yaml | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 0739fbfc2ab4..67dc0990cf27 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -11,18 +11,17 @@ presubmits: args: - -c - | - set -euo \ - BASE_SHA="${PULL_BASE_SHA:-""}" \ - ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}" \ - mkdir -p "${ARTIFACTS}" \ - cd "$ARTIFACTS" \ - go install github.com/kubernetes-sigs/depstat@latest \ - cd /go/src/k8s.io/kubernetes \ - function write_report() { depstat stats --json; } \ - function diff_reports() { diff "$1" "$2"; } \ - write_report > "${ARTIFACTS}/stats.json" \ + set -euo; \ + BASE_SHA="${PULL_BASE_SHA:-"09268c16853b233ebaedcd6a877eac23690b5190"}"; \ + ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; \ + mkdir -p "${ARTIFACTS}"; \ + cd "$ARTIFACTS"; \ + go install github.com/kubernetes-sigs/depstat@latest; \ + cd /go/src/k8s.io/kubernetes; \ + function write_report() { depstat stats --json; }; \ + write_report > "${ARTIFACTS}/stats.json"; \ if [ -n "${BASE_SHA}" ]; then \ - git checkout -b base "${BASE_SHA}" \ - write_report > "${ARTIFACTS}/stats-base.json" \ - diff_reports "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json \ - fi + git checkout -b base "${BASE_SHA}"; \ + write_report > "${ARTIFACTS}/stats-base.json"; \ + diff "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json; \ + fi; From cfb6940955c806df1470914ba49ba557ec56fe7a Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Fri, 14 May 2021 18:07:23 +0530 Subject: [PATCH 08/12] removed hardcoded Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 67dc0990cf27..4e8eb5c0f80c 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -12,7 +12,7 @@ presubmits: - -c - | set -euo; \ - BASE_SHA="${PULL_BASE_SHA:-"09268c16853b233ebaedcd6a877eac23690b5190"}"; \ + BASE_SHA="${PULL_BASE_SHA:-""}"; \ ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; \ mkdir -p "${ARTIFACTS}"; \ cd "$ARTIFACTS"; \ From 5d4a6a7978c642ac8006a95450900cea932ca69a Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Fri, 14 May 2021 18:20:41 +0530 Subject: [PATCH 09/12] major changes Signed-off-by: RinkiyaKeDad --- .../sig-arch/kubernetes-depstat.yaml | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 4e8eb5c0f80c..daa3081d7860 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -1,27 +1,24 @@ presubmits: kubernetes/kubernetes: - - name: kubernetes-depstat + - name: check-dependency-stats decorate: true - always_run: true - skip_report: true + always_run: false + optional: true spec: containers: - image: golang - command: ["/bin/bash"] + command: + - /bin/bash args: - -c - | set -euo; \ - BASE_SHA="${PULL_BASE_SHA:-""}"; \ - ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"; \ mkdir -p "${ARTIFACTS}"; \ - cd "$ARTIFACTS"; \ + pushd "$ARTIFACTS"; \ go install github.com/kubernetes-sigs/depstat@latest; \ + popd; \ cd /go/src/k8s.io/kubernetes; \ - function write_report() { depstat stats --json; }; \ - write_report > "${ARTIFACTS}/stats.json"; \ - if [ -n "${BASE_SHA}" ]; then \ - git checkout -b base "${BASE_SHA}"; \ - write_report > "${ARTIFACTS}/stats-base.json"; \ - diff "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json; \ - fi; + depstat stats --json > "${ARTIFACTS}/stats.json"; \ + git checkout -b base "${PULL_BASE_SHA}"; \ + depstat stats --json > "${ARTIFACTS}/stats-base.json"; \ + diff -s --ignore-all-space "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json || true; From 6b670bd312b7eb7877bde904f911b58761cc7d84 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Fri, 14 May 2021 18:27:03 +0530 Subject: [PATCH 10/12] major changes 2 Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index daa3081d7860..5675cfdc8633 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -7,7 +7,7 @@ presubmits: spec: containers: - image: golang - command: + command: - /bin/bash args: - -c From 70c516ccbeca04fe2c6bdd91e88e88b093d547f1 Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Fri, 14 May 2021 18:33:50 +0530 Subject: [PATCH 11/12] added annotations Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 5675cfdc8633..6329b1c6e1b9 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -22,3 +22,7 @@ presubmits: git checkout -b base "${PULL_BASE_SHA}"; \ depstat stats --json > "${ARTIFACTS}/stats-base.json"; \ diff -s --ignore-all-space "${ARTIFACTS}"/stats-base.json "${ARTIFACTS}"/stats.json || true; + annotations: + testgrid-create-test-group: "true" + testgrid-dashboards: sig-testing-misc + description: Generates dependency statistics by running depstat for base and current PR \ No newline at end of file From abe925c145a3876ca5f4dbdd004690127831285c Mon Sep 17 00:00:00 2001 From: RinkiyaKeDad Date: Fri, 14 May 2021 18:36:42 +0530 Subject: [PATCH 12/12] added new line Signed-off-by: RinkiyaKeDad --- config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml index 6329b1c6e1b9..6fecf77dc67a 100644 --- a/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml +++ b/config/jobs/kubernetes/sig-arch/kubernetes-depstat.yaml @@ -25,4 +25,4 @@ presubmits: annotations: testgrid-create-test-group: "true" testgrid-dashboards: sig-testing-misc - description: Generates dependency statistics by running depstat for base and current PR \ No newline at end of file + description: Generates dependency statistics by running depstat for base and current PR