From 08df7cbad34ce01c64c3f8c05eb14fe28fa1b7f5 Mon Sep 17 00:00:00 2001
From: Kalaiselvim <117940852+Kalaiselvi84@users.noreply.github.com>
Date: Tue, 2 May 2023 13:13:53 -0700
Subject: [PATCH] Move make release-deploy-site into pre-build-release (#3132)

* Move make release-deploy-site into pre-build-release

* Modified release_issue.md
---
 build/includes/website.mk                  |  2 +-
 build/release/pre_cloudbuild.yaml          | 10 +++++++++-
 docs/governance/templates/release_issue.md |  4 +---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/includes/website.mk b/build/includes/website.mk
index 2bfff970ba..2c354b0a05 100644
--- a/build/includes/website.mk
+++ b/build/includes/website.mk
@@ -50,7 +50,7 @@ site-gen-app-yaml:
 			"SERVICE=$(SERVICE) envsubst < app.yaml > .app.yaml"
 
 site-deploy: site-gen-app-yaml site-static
-	docker run -t --rm $(common_mounts) --workdir=$(mount_path) $(DOCKER_RUN_ARGS) \
+	docker run --network=cloudbuild -t --rm $(common_mounts) --workdir=$(mount_path) $(DOCKER_RUN_ARGS) \
 	-e GO111MODULE=on -e SHORT_SHA=$(shell git rev-parse --short=7 HEAD) $(build_tag) bash -c \
 	'printenv && cd  ./site && \
     gcloud app deploy .app.yaml --no-promote --quiet --version=$$SHORT_SHA'
diff --git a/build/release/pre_cloudbuild.yaml b/build/release/pre_cloudbuild.yaml
index 689817ed7c..9527504869 100644
--- a/build/release/pre_cloudbuild.yaml
+++ b/build/release/pre_cloudbuild.yaml
@@ -63,4 +63,12 @@ steps:
       - DOCKER_RUN_ARGS=--network=cloudbuild
     args: ["test-examples-on-gar"]
 
-timeout: 3600s
+  #
+  # Deploys the site by taking in the base version and deploying the previous version
+  #
+  - name: "make-docker"
+    id: release-deploy-site
+    dir: "build"
+    args: ["release-deploy-site"]
+
+timeout: 5400s
diff --git a/docs/governance/templates/release_issue.md b/docs/governance/templates/release_issue.md
index 9dc8514fb2..23c471a3e0 100644
--- a/docs/governance/templates/release_issue.md
+++ b/docs/governance/templates/release_issue.md
@@ -30,9 +30,7 @@ and copy it into a release issue. Fill in relevant values, found inside {}
 - [ ] Ensure the next version milestone is created.
 - [ ] Any issues in the current milestone that are not closed, move to next milestone.
 - [ ] `git checkout main && git pull --rebase upstream main`
-- [ ] Run `make release-deploy-site`
-      - For example, if you are creating the {version} release, then this would deploy the {version}-1 service (release minus one, and then replace dots with dashes)
-- [ ] Run `make pre-build-release` to ensure all example images exist on agones-images/examples repository.
+- [ ] Run `make pre-build-release` to ensure all example images exist on agones-images/examples repository and to deploy the {version}-1 service on GCP/App Engine/Services.
 - [ ] Ensure the [helm `tag` value][values] is correct (tag field value in image should be {version})
 - [ ] Ensure the [helm `Chart` version values][chart] are correct (appVersion and version fields value should be {version})
 - [ ] Update SDK Package Versions