File tree Expand file tree Collapse file tree 2 files changed +26
-1
lines changed Expand file tree Collapse file tree 2 files changed +26
-1
lines changed Original file line number Diff line number Diff line change 18
18
clean vet fmt version \
19
19
Dockerfile build-binaries docker-builder build-in-docker \
20
20
build-all build-all-container \
21
- build-tar-all push-all push-all-container push-manifest push-tar-all qemu-register
21
+ build-tar-all push-all push-all-container push-manifest push-tar-all qemu-register \
22
+ release-staging
22
23
23
24
TEMP_DIR := $(shell mktemp -d)
24
25
@@ -40,6 +41,9 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
40
41
# REGISTRY is the container registry to push into.
41
42
REGISTRY? =staging-k8s.gcr.io
42
43
44
+ # STAGING_REGISTRY is the new registry for staging
45
+ STAGING_REGISTRY? =gcr.io/k8s-staging-npd
46
+
43
47
# UPLOAD_PATH is the cloud storage path to upload release tar.
44
48
UPLOAD_PATH? =gs://kubernetes-release
45
49
# Trim the trailing '/' in the path
@@ -123,6 +127,7 @@ version:
123
127
@echo $(VERSION )
124
128
125
129
./bin/log-counter : $(PKG_SOURCES )
130
+ ifeq ($(ENABLE_JOURNALD ) , 1)
126
131
CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=$(ARCH) GO111MODULE=on go build \
127
132
-mod vendor \
128
133
-o bin/log-counter-$(ARCH) \
@@ -246,6 +251,9 @@ push-all: push-all-container push-manifest push-tar-all
246
251
247
252
push : push-container push-tar
248
253
254
+ release-staging :
255
+ REGISTRY=$(STAGING_REGISTRY ) $(MAKE ) push-all
256
+
249
257
clean :
250
258
rm -f bin/log-counter*
251
259
rm -f bin/node-problem-detector*
Original file line number Diff line number Diff line change
1
+ timeout : 1200s
2
+ options :
3
+ substitution_option : ALLOW_LOOSE
4
+ steps :
5
+ - name : ' gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4'
6
+ entrypoint : make
7
+ env :
8
+ - TAG=$_GIT_TAG
9
+ - BASE_REF=$_PULL_BASE_REF
10
+ - DOCKER_CLI_EXPERIMENTAL=enabled
11
+ args :
12
+ - release-staging
13
+ substitutions :
14
+ # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
15
+ # can be used as a substitution
16
+ _GIT_TAG : ' 12345'
17
+ _PULL_BASE_REF : ' dev'
You can’t perform that action at this time.
0 commit comments