experiment: update print-job-image-summary.sh

kubernetes · Sep 13, 2021 · 5fad4e0 · 5fad4e0
1 parent 724b878
commit 5fad4e0
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/experiment/print-job-image-summary.sh b/experiment/print-job-image-summary.sh
@@ -46,25 +46,25 @@ function image_include_exclude() {
 cat <<EOS
 # images used by prowjobs on prow.k8s.io
 - total /                      $(image_include_exclude "" "^$") 
-  - not gcr.io /               $(image_include_exclude "" "gcr\.io")
-    - dockerhub /              $(image_include_exclude "^[^\.]+$|^[^/]+$|docker\.io" "gcr\.io")
-    - quay.io /                $(image_include_exclude "quay\.io" "gcr\.io")
   - gcr.io /                   $(image_include_exclude "gcr\.io" "^$")
     - kubernetes.io gcp org
-      - k8s-staging            $(image_include_exclude "gcr\.io/k8s-staging" "^$")
+      - k8s-staging-test-infra $(image_include_exclude "gcr\.io/k8s-staging-test-infra" "^$")
+$(for i in $(image_include_exclude "gcr\.io/k8s-staging-test-infra" "^$" true | tail -n+2 | xargs -n1 basename); do printf \
+"        - %-20s %s\n" "${i}" "$(image_include_exclude "gcr\.io/k8s-staging-test-infra/${i}" "^$")"; \
+done | sort -k3 -rg)
+      - k8s-staging-the_rest   $(image_include_exclude "gcr\.io/k8s-staging" "test-infra")
       - k8s.gcr.io             $(image_include_exclude "k8s\.gcr\.io" "^$")
     - google.com gcp org
       - k8s-prow               $(image_include_exclude "gcr\.io/k8s-prow" "^$")
       - k8s-testimages         $(image_include_exclude "gcr\.io/k8s-testimages" "^$")
-        - kubekins-e2e         $(image_include_exclude "gcr\.io/k8s-testimages/kubekins-e2e" "^$")
-        - image-builder        $(image_include_exclude "gcr\.io/k8s-testimages/image-builder" "^$")
-        - krte                 $(image_include_exclude "gcr\.io/k8s-testimages/krte" "^$")
-        - other                $(image_include_exclude "gcr\.io/k8s-testimages" "kubekins-e2e|krte")
-$(for i in $(image_include_exclude "gcr\.io/k8s-testimages" "kubekins-e2e" true | tail -n+2 | xargs -n1 basename); do printf \
-"          - %-18s %s\n" "${i}" "$(image_include_exclude "gcr\.io/k8s-testimages/${i}" "^$")"; \
-done)
+$(for i in $(image_include_exclude "gcr\.io/k8s-testimages" "^$" true | tail -n+2 | xargs -n1 basename); do printf \
+"        - %-20s %s\n" "${i}" "$(image_include_exclude "gcr\.io/k8s-testimages/${i}" "^$")"; \
+done | sort -k3 -rg)
     - other (unsure which org) $(image_include_exclude "gcr\.io" "^k8s.|k8s-(staging|prow|testimages)")
 $(for i in $(image_include_exclude "gcr\.io" "^k8s.|k8s-(staging|prow|testimages)" true | tail -n+2 | xargs -n1 basename); do printf \
 "      - %-22s %s\n" "${i}" "$(image_include_exclude "gcr\.io/.*/${i}$" "^$")"; \
-done)
+done | sort -k3 -rg)
+  - not gcr.io /               $(image_include_exclude "" "gcr\.io")
+    - dockerhub /              $(image_include_exclude "^[^\.]+$|^[^/]+$|docker\.io" "gcr\.io")
+    - quay.io /                $(image_include_exclude "quay\.io" "gcr\.io")
 EOS