diff --git a/cloudbuild-kubepkg.yaml b/cloudbuild-kubepkg.yaml index 282bff88d09..4fea9666916 100644 --- a/cloudbuild-kubepkg.yaml +++ b/cloudbuild-kubepkg.yaml @@ -25,6 +25,8 @@ substitutions: _GIT_TAG: '12345' _PULL_BASE_REF: 'dev' _REGISTRY: 'fake.repository/registry-name' + # TODO(images): Remove once CI failures are resolved. + _CI_FAILURES: 'https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-release-push-image-releng-ci/1380321161841217536' images: - 'gcr.io/$PROJECT_ID/kubepkg:$_GIT_TAG' - 'gcr.io/$PROJECT_ID/kubepkg:latest' diff --git a/dependencies.yaml b/dependencies.yaml index 229d1c53f89..f64c8163d05 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -145,6 +145,55 @@ dependencies: - path: images/k8s-cloud-builder/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+ + # Golang (for previous release branches) + - name: "golang (for previous release branches)" + version: 1.15.11 + refPaths: + - path: images/build/cross/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + - path: images/build/go-runner/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + # TODO(images): Uncomment once releng-ci uses variants + #- path: images/releng/ci/cloudbuild.yaml + # match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + + - name: "golang: after kubernetes/kubernetes update (for previous release branches)" + version: 1.15.10 + refPaths: + - path: images/releng/k8s-ci-builder/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + + # Golang images (for previous release branches) + - name: "k8s.gcr.io/build-image/go-runner (for previous release branches)" + version: v2.3.1-go1.15.11-buster.0 + refPaths: + - path: images/build/go-runner/variants.yaml + match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + + - name: "k8s.gcr.io/build-image/go-runner: image revision (for previous release branches)" + version: 0 + refPaths: + - path: images/build/go-runner/variants.yaml + match: REVISION:\ '\d+' + + - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches)" + version: v1.15.11-1 + refPaths: + - path: images/build/cross/variants.yaml + match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+ + + - name: "k8s.gcr.io/build-image/kube-cross: config variant (for previous release branches)" + version: go1.15 + refPaths: + - path: images/build/cross/variants.yaml + match: go\d+.\d+ + + - name: "k8s.gcr.io/build-image/kube-cross: dependents (for previous release branches)" + version: v1.15.10-1 + refPaths: + - path: images/k8s-cloud-builder/variants.yaml + match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+ + # golangci-lint - name: "golangci-lint" version: 1.31.0 diff --git a/images/k8s-cloud-builder/ci-failures b/images/k8s-cloud-builder/ci-failures new file mode 100644 index 00000000000..d175e547b16 --- /dev/null +++ b/images/k8s-cloud-builder/ci-failures @@ -0,0 +1 @@ +https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-release-push-image-k8s-cloud-builder/1380321161795080192 diff --git a/images/releng/ci/ci-failures b/images/releng/ci/ci-failures new file mode 100644 index 00000000000..678418fd603 --- /dev/null +++ b/images/releng/ci/ci-failures @@ -0,0 +1 @@ +https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-release-push-image-releng-ci/1380321161841217536 diff --git a/images/releng/k8s-ci-builder/ci-failures b/images/releng/k8s-ci-builder/ci-failures new file mode 100644 index 00000000000..365e7e7864b --- /dev/null +++ b/images/releng/k8s-ci-builder/ci-failures @@ -0,0 +1 @@ +https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-release-push-image-k8s-ci-builder/1382488810838822912 diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index c3041d9871d..eba46ed4ce6 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -7,19 +7,19 @@ variants: SKOPEO_VERSION: 'v1.2.0' '1.20': CONFIG: '1.20' - GO_VERSION: '1.16.1' + GO_VERSION: '1.15.10' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' SKOPEO_VERSION: 'v1.2.0' '1.19': CONFIG: '1.19' - GO_VERSION: '1.16.1' + GO_VERSION: '1.15.10' BAZEL_VERSION: '2.2.0' OLD_BAZEL_VERSION: '0.23.2' SKOPEO_VERSION: 'v1.2.0' '1.18': CONFIG: '1.18' - GO_VERSION: '1.16.1' + GO_VERSION: '1.13.15' BAZEL_VERSION: '2.2.0' OLD_BAZEL_VERSION: '0.23.2' SKOPEO_VERSION: 'v1.2.0'