Merge pull request #23626 from justaugustus/promo-tools-rename

releng: Post-rename tasks for sigs.k8s.io/promo-tools

config/jobs/image-pushing/releng/k8s-staging-artifact-promoter.yaml

@@ -41,8 +41,6 @@ postsubmits:
       decorate: true
       branches:
         - ^main$
-        # TODO(releng): Remove once repo default branch has been renamed
-        - ^master$
       spec:
         serviceAccountName: gcb-builder
         containers:

config/jobs/kubernetes-sigs/promo-tools/OWNERS

@@ -0,0 +1,14 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- release-engineering-approvers
+- promo-tools-approvers
+
+reviewers:
+- release-engineering-reviewers
+- promo-tools-reviewers
+
+labels:
+- sig/release
+- area/release-eng
+- area/artifacts

config/jobs/kubernetes/sig-release/promo-tools/promo-tools.yaml → config/jobs/kubernetes-sigs/promo-tools/promo-tools.yaml

@@ -1,93 +1,4 @@
 presubmits:
-  # Check that changes to promoter manifests are valid.
-  kubernetes/k8s.io:
-  - name: pull-k8sio-cip
-    annotations:
-      testgrid-create-test-group: 'true'
-      testgrid-dashboards: wg-k8s-infra-k8sio
-    decorate: true
-    skip_report: false
-    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
-    max_concurrency: 10
-    branches:
-    - ^main$
-    spec:
-      containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
-        command:
-        - cip
-        args:
-        - run
-        # Pod Utilities already sets pwd to
-        # /home/prow/go/src/github.com/{{.Org}}/{{.Repo}}, so just '.' should
-        # suffice, but it's nice to be explicit.
-        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
-  # Check that images to be promoted are free of fixable vulnerabilities
-  - name: pull-k8sio-cip-vuln
-    annotations:
-      testgrid-create-test-group: 'true'
-      testgrid-dashboards: wg-k8s-infra-k8sio
-    decorate: true
-    optional: true
-    skip_report: false
-    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
-    max_concurrency: 10
-    branches:
-    - ^vuln-check-test$
-    spec:
-      serviceAccountName: k8s-infra-gcr-vuln-scanning
-      containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
-        command:
-        - cip
-        args:
-        - run
-        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
-        - --vuln-severity-threshold=1
-  # Check that changes to backup scripts are valid.
-  - name: pull-k8sio-backup
-    annotations:
-      testgrid-create-test-group: 'true'
-      testgrid-dashboards: wg-k8s-infra-k8sio
-    decorate: true
-    run_if_changed: '^infra/gcp/backup_tools/'
-    max_concurrency: 1
-    branches:
-    - ^main$
-    spec:
-      serviceAccountName: k8s-infra-gcr-promoter-test
-      containers:
-      - image: gcr.io/k8s-staging-infra-tools/k8s-infra:latest
-        command:
-        - infra/gcp/bash/backup_tools/backup_test.sh
-        env:
-        # Even though GOPATH is set to /go in the kubekins-e2e image, we set it
-        # here anyway in case the underlying image changes (the backup_test.sh
-        # script needs it to be defined).
-        - name: GOPATH
-          value: /go
-  - name: pull-k8sio-file-promo
-    annotations:
-      testgrid-create-test-group: 'true'
-      testgrid-dashboards: sig-release-releng-blocking, wg-k8s-infra-k8sio
-      testgrid-alert-email: [email protected], [email protected]
-      testgrid-num-failures-to-alert: '10'
-    decorate: true
-    skip_report: false
-    run_if_changed: '^artifacts\/(filestores|manifests)\/.*\/*.yaml'
-    max_concurrency: 10
-    branches:
-    - ^main$
-    spec:
-      containers:
-      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.2.0-1
-        command:
-        - /kpromo
-        args:
-        - run
-        - files
-        - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/
-        - --dry-run=true
   kubernetes-sigs/promo-tools:
   # Run promoter e2e tests.
   - name: pull-cip-e2e
@@ -102,8 +13,6 @@ presubmits:
       preset-dind-enabled: "true"
     branches:
     - ^main$
-    # TODO(releng): Remove once repo default branch has been renamed
-    - ^master$
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20210915-5dbaf53458-master
@@ -141,8 +50,6 @@ presubmits:
       preset-dind-enabled: "true"
     branches:
     - ^main$
-    # TODO(releng): Remove once repo default branch has been renamed
-    - ^master$
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20210915-5dbaf53458-master
@@ -211,8 +118,6 @@ presubmits:
     always_run: true
     branches:
     - ^main$
-    # TODO(releng): Remove once repo default branch has been renamed
-    - ^master$
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20210915-5dbaf53458-master
@@ -232,8 +137,6 @@ presubmits:
     always_run: true
     branches:
     - ^main$
-    # TODO(releng): Remove once repo default branch has been renamed
-    - ^master$
     spec:
       containers:
       - image: gcr.io/k8s-staging-releng/releng-ci:latest-go1.17
@@ -254,8 +157,6 @@ presubmits:
       preset-dind-enabled: "true"
     branches:
     - ^main$
-    # TODO(releng): Remove once repo default branch has been renamed
-    - ^master$
     spec:
       containers:
       - image: gcr.io/k8s-staging-releng/k8s-ci-builder:latest-default

config/jobs/kubernetes/wg-k8s-infra/releng/artifact-promotion-presubmits.yaml

@@ -0,0 +1,90 @@
+presubmits:
+  # Check that changes to promoter manifests are valid.
+  kubernetes/k8s.io:
+  - name: pull-k8sio-cip
+    annotations:
+      testgrid-create-test-group: 'true'
+      testgrid-dashboards: wg-k8s-infra-k8sio
+    decorate: true
+    skip_report: false
+    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
+    max_concurrency: 10
+    branches:
+    - ^main$
+    spec:
+      containers:
+      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+        command:
+        - cip
+        args:
+        - run
+        # Pod Utilities already sets pwd to
+        # /home/prow/go/src/github.com/{{.Org}}/{{.Repo}}, so just '.' should
+        # suffice, but it's nice to be explicit.
+        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
+  # Check that images to be promoted are free of fixable vulnerabilities
+  - name: pull-k8sio-cip-vuln
+    annotations:
+      testgrid-create-test-group: 'true'
+      testgrid-dashboards: wg-k8s-infra-k8sio
+    decorate: true
+    optional: true
+    skip_report: false
+    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
+    max_concurrency: 10
+    branches:
+    - ^vuln-check-test$
+    spec:
+      serviceAccountName: k8s-infra-gcr-vuln-scanning
+      containers:
+      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+        command:
+        - cip
+        args:
+        - run
+        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
+        - --vuln-severity-threshold=1
+  # Check that changes to backup scripts are valid.
+  - name: pull-k8sio-backup
+    annotations:
+      testgrid-create-test-group: 'true'
+      testgrid-dashboards: wg-k8s-infra-k8sio
+    decorate: true
+    run_if_changed: '^infra/gcp/backup_tools/'
+    max_concurrency: 1
+    branches:
+    - ^main$
+    spec:
+      serviceAccountName: k8s-infra-gcr-promoter-test
+      containers:
+      - image: gcr.io/k8s-staging-infra-tools/k8s-infra:latest
+        command:
+        - infra/gcp/bash/backup_tools/backup_test.sh
+        env:
+        # Even though GOPATH is set to /go in the kubekins-e2e image, we set it
+        # here anyway in case the underlying image changes (the backup_test.sh
+        # script needs it to be defined).
+        - name: GOPATH
+          value: /go
+  - name: pull-k8sio-file-promo
+    annotations:
+      testgrid-create-test-group: 'true'
+      testgrid-dashboards: sig-release-releng-blocking, wg-k8s-infra-k8sio
+      testgrid-alert-email: [email protected], [email protected]
+      testgrid-num-failures-to-alert: '10'
+    decorate: true
+    skip_report: false
+    run_if_changed: '^artifacts\/(filestores|manifests)\/.*\/*.yaml'
+    max_concurrency: 10
+    branches:
+    - ^main$
+    spec:
+      containers:
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.2.0-1
+        command:
+        - /kpromo
+        args:
+        - run
+        - files
+        - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/
+        - --dry-run=true