Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

images: rm k8s-testimages in Makefiles #23774

Merged
merged 1 commit into from
Sep 27, 2021
Merged

images: rm k8s-testimages in Makefiles #23774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/bazelbuild/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

push-prod:
bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch --build-dir=. images/bazelbuild
bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb --build-dir=. images/bazelbuild

push:
bazel run //images/builder -- --allow-dirty --build-dir=. images/bazelbuild
Expand Down
2 changes: 1 addition & 1 deletion images/bigquery/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

push-prod:
bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/bigquery
bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/bigquery

push:
bazel run //images/builder -- --allow-dirty images/bigquery
Expand Down
2 changes: 1 addition & 1 deletion images/bootstrap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

push-prod:
bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/bootstrap
bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/bootstrap

push:
bazel run //images/builder -- --allow-dirty images/bootstrap
Expand Down
2 changes: 1 addition & 1 deletion images/builder/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Used by gcr.io/k8s-testimages/image-builder.
# Used by gcr.io/k8s-staging-test-infra/image-builder.
# See ci-runner.sh for the version prow uses to build and run on the fly.

set -e
Expand Down
2 changes: 1 addition & 1 deletion images/gcb-docker-gcloud/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

push-prod:
bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/gcb-docker-gcloud
bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/gcb-docker-gcloud

push:
bazel run //images/builder -- --allow-dirty images/gcb-docker-gcloud
Expand Down
2 changes: 1 addition & 1 deletion images/gcloud-in-go/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

push-prod:
bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/gcloud-in-go
bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/gcloud-in-go

push:
bazel run //images/builder -- --allow-dirty images/gcloud-in-go
Expand Down
2 changes: 1 addition & 1 deletion images/krte/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ifneq ($(K8S), everything)
endif

push-prod:
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/krte
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/krte

push:
bazel run //images/builder -- $(EXTRA_ARG) --allow-dirty images/krte
Expand Down
2 changes: 1 addition & 1 deletion images/kubekins-e2e/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ifneq ($(K8S), everything)
endif

push-prod:
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch --build-dir=. images/kubekins-e2e
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb --build-dir=. images/kubekins-e2e

push:
bazel run //images/builder -- $(EXTRA_ARG) --allow-dirty --build-dir=. images/kubekins-e2e
Expand Down