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

@@ -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'

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

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