Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy #3522

Kalaiselvi84 · 2023-11-29T00:23:19Z

What type of PR is this?

Uncomment only one /kind <> line, press enter to put that in a new line, and remove leading whitespace from that line:

/kind breaking
/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind hotfix
/kind release

What this PR does / Why we need it:

Which issue(s) this PR fixes:

Closes #3476

Special notes for your reviewer:

Kalaiselvi84 · 2023-11-29T00:25:48Z

@markmandel, Could you please review this PR? I am unsure if I am in the right direction.

agones-bot · 2023-11-29T00:32:05Z

Build Failed 😱

Build Id: 1ba134d9-cd71-408b-9611-5f108ec5c1e4

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

markmandel

I assume this is a vendoring of the code from the community repo? But looks like you updated the tags to use Artifact Registry? 👍🏻

This should sit somewhere in /build -- maybe under /build/build-image/cache ?

The only other thing that looks like something we should do is ensure each file has the Apache 2 licence. It's weird that the original builder files don't.... but we should definitely make sure we do.

Ooh - also, let's throw a README.md in the directory explaining where this originally came from and what changes were made on import in case we ever want to update it.

Sound good?

Kalaiselvi84 · 2023-11-29T04:33:33Z

I assume this is a vendoring of the code from the community repo? But looks like you updated the tags to use Artifact Registry? 👍🏻

Yes, that's correct. However, I am fine with the second approach. Looking forward to hearing your preference.

This should sit somewhere in /build -- maybe under /build/build-image/cache ?

Moved files to /build/build-image/cache.

The only other thing that looks like something we should do is ensure each file has the Apache 2 licence. It's weird that the original builder files don't.... but we should definitely make sure we do.

Done!

Ooh - also, let's throw a README.md in the directory explaining where this originally came from and what changes were made on import in case we ever want to update it.

Included the origin and the changes made in our repo.

agones-bot · 2023-11-29T04:36:58Z

Build Failed 😱

Build Id: 654c4256-b735-48ff-b120-4d0cfeda18d9

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

agones-bot · 2023-11-29T06:03:00Z

Build Succeeded 👏

Build Id: e321f0b5-928c-4683-873b-bd558af67517

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

https://96d748e-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3522/head:pr_3522 && git checkout pr_3522
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.37.0-dev-96d748e-amd64

Kalaiselvi84 · 2023-11-30T00:39:11Z

The cloudbuild.yaml script is failing; it looks like we need to modify the steps based on our repo.🤔

markmandel · 2023-11-30T00:54:42Z

The cloudbuild.yaml script is failing; it looks like we need to modify the steps based on our repo.🤔

What's the output when it fails?

Kalaiselvi84 · 2023-11-30T04:57:43Z

What's the output when it fails?

Log indicates: Step #1 - "build_save_cache": Unknown option: build
Here's the full log - https://gist.github.com/Kalaiselvi84/13b9286ad4ab6e1e0477d79eeb06c96c

markmandel

Try that 👍🏻

markmandel · 2023-12-01T00:08:26Z

build/build-image/cache/cloudbuild.yaml

+      - '--file=Dockerfile-base'
+      - '.'
+
+  - name: 'us-docker.pkg.dev/$PROJECT_ID/ci/save_cache'


Suggested change

- name: 'us-docker.pkg.dev/$PROJECT_ID/ci/save_cache'

- name: 'gcr.io/cloud-builders/docker'

Since this is building the docker container, so it needs to use docker as the build step container.

markmandel · 2023-12-01T00:08:53Z

build/build-image/cache/cloudbuild.yaml

+      - '--cache-from=us-docker.pkg.dev/$PROJECT_ID/ci/cache:latest'
+      - '.'
+
+  - name: 'us-docker.pkg.dev/$PROJECT_ID/ci/restore_cache'


Suggested change

- name: 'us-docker.pkg.dev/$PROJECT_ID/ci/restore_cache'

- name: 'gcr.io/cloud-builders/docker'

Success Log: https://gist.github.com/Kalaiselvi84/5ccadb47f469435391ce91a3148cfeae

Whole time I was searching for the alternate options.😬

agones-bot · 2023-12-01T02:40:30Z

Build Succeeded 👏

Build Id: 07a4e632-8a03-4c41-9b43-7993139f8bf6

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

https://cf166d0-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3522/head:pr_3522 && git checkout pr_3522
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.37.0-dev-cf166d0-amd64

markmandel

Looks good - one comment and this can definitely come out of draft.

markmandel · 2023-12-01T21:45:31Z

build/includes/release.mk

@@ -87,3 +87,8 @@ pre-build-release:
 post-build-release:
 	docker run --rm $(common_mounts) -w $(workdir_path)/build/release $(build_tag) \
 		gcloud builds submit . --substitutions _VERSION=$(base_version) --config=./post_cloudbuild.yaml $(ARGS)
+
+# Ensure that ci/save_cache and ci/restore_cache are not deleted by the cleanup policy
+cache-save-restore:


🤔 I don't need this for the setup of the Cloud Build scheduled triggers, but if we want to keep it for testing purposes (which is useful), I think it might be better to be part of https://github.com/googleforgames/agones/blob/main/build/includes/build-image.mk since it's not a target needed for the release process.

Open to suggestion on a better place, but that's the best idea I had.

Understood. I'll go ahead and remove it since it's not required for the setup of the Cloud Build scheduled triggers.

google-oss-prow · 2023-12-01T22:39:10Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Kalaiselvi84, markmandel

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [markmandel]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

agones-bot · 2023-12-01T23:39:49Z

Build Failed 😱

Build Id: fa08d1e7-23f5-4cec-a6b9-05d37fea590b

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

agones-bot · 2023-12-04T23:00:55Z

Build Succeeded 👏

Build Id: 480aff36-7247-45ff-a88f-41bf0704b3e2

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

https://8249e5c-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3522/head:pr_3522 && git checkout pr_3522
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.37.0-dev-8249e5c-amd64

ci:save_cache and restore_cache

f615ebb

Kalaiselvi84 requested a review from markmandel November 29, 2023 00:23

google-oss-prow bot added the do-not-merge/work-in-progress label Nov 29, 2023

google-oss-prow bot requested review from cyriltovena and roberthbailey November 29, 2023 00:23

google-oss-prow bot added the size/L label Nov 29, 2023

github-actions bot added the kind/other label Nov 29, 2023

Kalaiselvi84 removed request for cyriltovena and roberthbailey November 29, 2023 00:23

markmandel reviewed Nov 29, 2023

View reviewed changes

Review changes

bf82cbf

google-oss-prow bot added size/XL and removed size/L labels Nov 29, 2023

fix lint

96d748e

markmandel reviewed Dec 1, 2023

View reviewed changes

Kalaiselvi84 added 2 commits December 1, 2023 01:32

Review update

d61a476

Merge branch 'main' into cache

cf166d0

markmandel reviewed Dec 1, 2023

View reviewed changes

Kalaiselvi84 added 2 commits December 1, 2023 21:57

Remove target

c3b1033

Merge branch 'main' into cache

8249e5c

Kalaiselvi84 marked this pull request as ready for review December 1, 2023 21:58

google-oss-prow bot removed the do-not-merge/work-in-progress label Dec 1, 2023

google-oss-prow bot requested review from aLekSer and cyriltovena December 1, 2023 21:58

Kalaiselvi84 changed the title ~~ci:save_cache and restore_cache~~ Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy Dec 1, 2023

markmandel approved these changes Dec 1, 2023

View reviewed changes

google-oss-prow bot assigned markmandel Dec 1, 2023

google-oss-prow bot added the lgtm label Dec 1, 2023

markmandel enabled auto-merge (squash) December 1, 2023 22:39

google-oss-prow bot added the approved label Dec 1, 2023

markmandel merged commit 5992e2a into googleforgames:main Dec 4, 2023
3 checks passed

Kalaiselvi84 added area/tests Unit tests, e2e tests, anything to make sure things don't break area/build-tools Development tooling. I.e. pretty much everything in the `build` directory. and removed kind/other labels Dec 12, 2023

Kalaiselvi84 deleted the cache branch March 15, 2024 01:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy #3522

Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy #3522

Kalaiselvi84 commented Nov 29, 2023 •

edited

Kalaiselvi84 commented Nov 29, 2023

agones-bot commented Nov 29, 2023

markmandel left a comment

Kalaiselvi84 commented Nov 29, 2023

agones-bot commented Nov 29, 2023

agones-bot commented Nov 29, 2023

Kalaiselvi84 commented Nov 30, 2023

markmandel commented Nov 30, 2023

Kalaiselvi84 commented Nov 30, 2023

markmandel left a comment

markmandel Dec 1, 2023

markmandel Dec 1, 2023

Kalaiselvi84 Dec 1, 2023

agones-bot commented Dec 1, 2023

markmandel left a comment

markmandel Dec 1, 2023

Kalaiselvi84 Dec 1, 2023

google-oss-prow bot commented Dec 1, 2023

agones-bot commented Dec 1, 2023

agones-bot commented Dec 4, 2023

	- name: 'us-docker.pkg.dev/$PROJECT_ID/ci/save_cache'
	- name: 'gcr.io/cloud-builders/docker'

Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy #3522

Ensure ci/save_cache and ci/restore_cache images don't get deleted by cleanup policy #3522

Conversation

Kalaiselvi84 commented Nov 29, 2023 • edited

Kalaiselvi84 commented Nov 29, 2023

agones-bot commented Nov 29, 2023

markmandel left a comment

Choose a reason for hiding this comment

Kalaiselvi84 commented Nov 29, 2023

agones-bot commented Nov 29, 2023

agones-bot commented Nov 29, 2023

Kalaiselvi84 commented Nov 30, 2023

markmandel commented Nov 30, 2023

Kalaiselvi84 commented Nov 30, 2023

markmandel left a comment

Choose a reason for hiding this comment

markmandel Dec 1, 2023

Choose a reason for hiding this comment

markmandel Dec 1, 2023

Choose a reason for hiding this comment

Kalaiselvi84 Dec 1, 2023

Choose a reason for hiding this comment

agones-bot commented Dec 1, 2023

markmandel left a comment

Choose a reason for hiding this comment

markmandel Dec 1, 2023

Choose a reason for hiding this comment

Kalaiselvi84 Dec 1, 2023

Choose a reason for hiding this comment

google-oss-prow bot commented Dec 1, 2023

agones-bot commented Dec 1, 2023

agones-bot commented Dec 4, 2023

Kalaiselvi84 commented Nov 29, 2023 •

edited