From b9d7ac43a16e12be8bc1ef91d0b1b4d5680e123f Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 12 Jun 2020 15:00:51 +0200
Subject: [PATCH] image pushing: k8s-staging-csi -> k8s-staging-sig-storage

As discussed in https://github.com/kubernetes/k8s.io/pull/943, we want
to consolidate all SIG-Storage related work under the new
k8s-staging-sig-storage, including the former k8s-staging-csi.
---
 ...-csi-gen.sh => k8s-staging-sig-storage.sh} | 10 ++--
 ...-csi.yaml => k8s-staging-sig-storage.yaml} | 54 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)
 rename config/jobs/image-pushing/{k8s-staging-csi-gen.sh => k8s-staging-sig-storage.sh} (87%)
 rename config/jobs/image-pushing/{k8s-staging-csi.yaml => k8s-staging-sig-storage.yaml} (91%)

diff --git a/config/jobs/image-pushing/k8s-staging-csi-gen.sh b/config/jobs/image-pushing/k8s-staging-sig-storage.sh
similarity index 87%
rename from config/jobs/image-pushing/k8s-staging-csi-gen.sh
rename to config/jobs/image-pushing/k8s-staging-sig-storage.sh
index c00748172f4e7..05b7add65fe94 100755
--- a/config/jobs/image-pushing/k8s-staging-csi-gen.sh
+++ b/config/jobs/image-pushing/k8s-staging-sig-storage.sh
@@ -15,7 +15,7 @@
 
 set -o errexit
 
-readonly OUTPUT="$(dirname $0)/k8s-staging-csi.yaml"
+readonly OUTPUT="$(dirname $0)/k8s-staging-sig-storage.yaml"
 readonly REPOS=(
     csi-driver-host-path
     csi-driver-iscsi
@@ -33,7 +33,7 @@ readonly REPOS=(
 )
 
 cat >"${OUTPUT}" <<EOF
-# Automatically generated by k8s-staging-csi-gen.sh.
+# Automatically generated by k8s-staging-sig-storage-gen.sh.
 
 postsubmits:
 EOF
@@ -58,15 +58,15 @@ for repo in "${REPOS[@]}"; do
       spec:
         serviceAccountName: gcb-builder
         containers:
-          - image: gcr.io/k8s-testimages/image-builder:v20200422-c760048
+          - image: gcr.io/k8s-testimages/image-builder:v20200603-f2d2bf0
             command:
               - /run.sh
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
 EOF
diff --git a/config/jobs/image-pushing/k8s-staging-csi.yaml b/config/jobs/image-pushing/k8s-staging-sig-storage.yaml
similarity index 91%
rename from config/jobs/image-pushing/k8s-staging-csi.yaml
rename to config/jobs/image-pushing/k8s-staging-sig-storage.yaml
index 74e08b8d111ed..eeb525f0f915b 100644
--- a/config/jobs/image-pushing/k8s-staging-csi.yaml
+++ b/config/jobs/image-pushing/k8s-staging-sig-storage.yaml
@@ -1,4 +1,4 @@
-# Automatically generated by k8s-staging-csi-gen.sh.
+# Automatically generated by k8s-staging-sig-storage-gen.sh.
 
 postsubmits:
   kubernetes-csi/csi-driver-host-path:
@@ -25,9 +25,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/csi-driver-iscsi:
@@ -54,9 +54,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/csi-driver-nfs:
@@ -83,9 +83,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/csi-driver-smb:
@@ -112,9 +112,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/csi-proxy:
@@ -141,9 +141,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/csi-test:
@@ -170,9 +170,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/external-attacher:
@@ -199,9 +199,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/external-health-monitor:
@@ -228,9 +228,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/external-provisioner:
@@ -257,9 +257,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/external-resizer:
@@ -286,9 +286,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/external-snapshotter:
@@ -315,9 +315,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/livenessprobe:
@@ -344,9 +344,9 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .
   kubernetes-csi/node-driver-registrar:
@@ -373,8 +373,8 @@ postsubmits:
             args:
               # this is the project GCB will run in, which is the same as the GCR
               # images are pushed to.
-              - --project=k8s-staging-csi
+              - --project=k8s-staging-sig-storage
               # This is the same as above, but with -gcb appended.
-              - --scratch-bucket=gs://k8s-staging-csi-gcb
+              - --scratch-bucket=gs://k8s-staging-sig-storage-gcb
               - --env-passthrough=PULL_BASE_REF
               - .