CI: Adding E2E cluster name as a parameter for CloudBuild #1611

aLekSer · 2020-06-03T11:25:51Z

This is needed to make E2E tests in parallel on a stable version and with FeatureGates.
Remove dependencies of E2E cloud builds steps,
because we are using TestCluster name as prefix.

What type of PR is this?

Uncomment only one /kind <> line, hit 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

What this PR does / Why we need it:

Which issue(s) this PR fixes:

For #1411

Special notes for your reviewer:

Requested here: #1546

agones-bot · 2020-06-03T11:48:03Z

Build Succeeded 👏

Build Id: 317eff69-332d-41de-b19a-4b0151c88f93

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

image: gcr.io/agones-images/agones-controller:1.7.0-2574e7a
image: gcr.io/agones-images/agones-sdk:1.7.0-2574e7a
image: gcr.io/agones-images/agones-ping:1.7.0-2574e7a
Linux C++ SDK (build): agonessdk-1.7.0-2574e7a-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.7.0-2574e7a.zip

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

https://2574e7a-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1611/head:pr_1611 && git checkout pr_1611
helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.7.0-2574e7a

agones-bot · 2020-06-03T11:59:54Z

Build Succeeded 👏

Build Id: 536a4a9a-7599-497c-8bca-52ee0089cc36

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

image: gcr.io/agones-images/agones-controller:1.7.0-07f1ac6
image: gcr.io/agones-images/agones-sdk:1.7.0-07f1ac6
image: gcr.io/agones-images/agones-ping:1.7.0-07f1ac6
Linux C++ SDK (build): agonessdk-1.7.0-07f1ac6-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.7.0-07f1ac6.zip

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

https://07f1ac6-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1611/head:pr_1611 && git checkout pr_1611
helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.7.0-07f1ac6

aLekSer · 2020-06-03T12:30:14Z

This one Pull Request would break parallel E2E test builds in other PR. But after merging this to master and to all PRs this issue would be gone.
As an option I can add one more like if [ name = test-cluster-e2e] use LockE2E as a prefix for consul lock.

agones-bot · 2020-06-03T12:34:33Z

Build Succeeded 👏

Build Id: 151886e2-22b4-43a0-8b20-93cc16d7e445

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

image: gcr.io/agones-images/agones-controller:1.7.0-6738d48
image: gcr.io/agones-images/agones-sdk:1.7.0-6738d48
image: gcr.io/agones-images/agones-ping:1.7.0-6738d48
Linux C++ SDK (build): agonessdk-1.7.0-6738d48-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.7.0-6738d48.zip

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

https://6738d48-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1611/head:pr_1611 && git checkout pr_1611
helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.7.0-6738d48

agones-bot · 2020-06-03T12:39:25Z

Build Succeeded 👏

Build Id: 43f0d06f-d2cd-45df-bcba-c33262d69fc8

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

image: gcr.io/agones-images/agones-controller:1.7.0-51c2342
image: gcr.io/agones-images/agones-sdk:1.7.0-51c2342
image: gcr.io/agones-images/agones-ping:1.7.0-51c2342
Linux C++ SDK (build): agonessdk-1.7.0-51c2342-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.7.0-51c2342.zip

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

https://51c2342-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1611/head:pr_1611 && git checkout pr_1611
helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.7.0-51c2342

markmandel · 2020-06-03T18:45:18Z

build/e2e-image/entrypoint.sh

        --zone=us-west1-c --project=agones-images
 kubectl port-forward statefulset/consul 8500:8500 &
 echo "Waiting consul port-forward to launch on 8500..."
 timeout 60 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' 127.0.0.1 8500
 echo "consul port-forward launched. Starting e2e tests..."
-echo "consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh "$FEATURES""
-consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh "'$FEATURES'"'
+echo "consul lock -child-exit-code=true -timeout 30m -try 30m -verbose "$TEST_CLUSTER_NAME" '/root/e2e.sh "$FEATURES""


Since we're going to either run e2e tests in serial in the same cluster, or in parallel on different clusters, do we need to change the name? (not that is likely matters), just curious?

I can add Lock- prefix to the cluster name. This approach would work for both options - serial and parallel. If someone acquire the lock by his cluster name, others would wait. What name do you expect here?

oh wait! I think I understand - we only have one consul in one cluster, yes? So we use that for both locks?

I think I was assuming there was a consul in each cluster, and it would lock against each one.

This option with a separate name would work for both cases.
But yes we have a consul per Cluster, so no need to change this prefix parameter.

agones/build/includes/google-cloud.mk

Line 53 in e80cb60

helm install --wait --set Replicas=1,uiService.type=ClusterIP --name consul stable/consul

I'm thinking that a consul per cluster will be easier, otherwise if you are running a seperate build on a different cluster, you need to know about 2 clusters, not just one
-- and proxy to another while sending commands to the 2nd. Could get complicated.

Yes, it is a consul per cluster in this design. I have overseen this before, return back.

The next step would be to remove dependencies of cloud builds step, because we are using TestCluster name as prefix.

Add cluster name for make targets.

markmandel · 2020-06-16T17:19:11Z

build/e2e-image/entrypoint.sh

        --zone=us-west1-c --project=agones-images
 kubectl port-forward statefulset/consul 8500:8500 &
 echo "Waiting consul port-forward to launch on 8500..."
 timeout 60 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' 127.0.0.1 8500
 echo "consul port-forward launched. Starting e2e tests..."
-echo "consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh "$FEATURES""
+echo "consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh "$FEATURES"'"


Is this apostrophe correct? Should there be a partner somewhere?

It should result in '/root/e2e.sh $FEATURES'

Note that this is echo command. From Cloud build:

Step #22 - "e2e-stable": Handling connection for 8500 Step #22 - "e2e-stable": consul port-forward launched. Starting e2e tests... Step #22 - "e2e-stable": consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh ' Step #21 - "e2e-feature-gates": Handling connection for 8500 Step #21 - "e2e-feature-gates": consul port-forward launched. Starting e2e tests... Step #21 - "e2e-feature-gates": consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh PlayerTracking=true&ContainerPortAllocation=true'

markmandel

LGTM!

google-oss-robot · 2020-06-22T23:05:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aLekSer, 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

google-oss-robot · 2020-06-22T23:48:16Z

New changes are detected. LGTM label has been removed.

agones-bot · 2020-06-23T00:30:23Z

Build Failed 😱

Build Id: 295b34bf-5b89-4841-841c-752be53a0813

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

agones-bot · 2020-06-23T01:21:15Z

Build Succeeded 👏

Build Id: a43b3ece-61e8-4b81-b32b-9dc2fd7a6c37

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

image: gcr.io/agones-images/agones-controller:1.7.0-9e50640
image: gcr.io/agones-images/agones-sdk:1.7.0-9e50640
image: gcr.io/agones-images/agones-ping:1.7.0-9e50640
Linux C++ SDK (build): agonessdk-1.7.0-9e50640-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.7.0-9e50640.zip

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

https://9e50640-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/1611/head:pr_1611 && git checkout pr_1611
helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.7.0-9e50640

…ames#1611) * Adding name of a cluster as a parameter The next step would be to remove dependencies of cloud builds step, because we are using TestCluster name as prefix. * Remove dependency of E2E stable run from features * Fix Consul lock variable name. Add cluster name for make targets. Co-authored-by: Mark Mandel <markmandel@google.com>

google-oss-robot requested review from cyriltovena and dzlier-gcp June 3, 2020 11:25

google-oss-robot added the size/S label Jun 3, 2020

aLekSer added the area/tests Unit tests, e2e tests, anything to make sure things don't break label Jun 3, 2020

aLekSer requested a review from markmandel June 3, 2020 11:49

aLekSer force-pushed the e2e/add-cluster-var branch 2 times, most recently from 51c2342 to 6738d48 Compare June 3, 2020 12:09

aLekSer mentioned this pull request Jun 3, 2020

Additional commands for prometheus and grafana #1601

Merged

aLekSer added the kind/breaking Breaking change label Jun 3, 2020

markmandel reviewed Jun 3, 2020

View reviewed changes

aLekSer added 2 commits June 10, 2020 14:28

Adding name of a cluster as a parameter

2475d35

The next step would be to remove dependencies of cloud builds step, because we are using TestCluster name as prefix.

Remove dependency of E2E stable run from features

fb79cc9

aLekSer force-pushed the e2e/add-cluster-var branch from 6738d48 to dbf3830 Compare June 10, 2020 11:28

googlebot added the cla: yes label Jun 10, 2020

Fix Consul lock variable name.

34e408b

Add cluster name for make targets.

aLekSer force-pushed the e2e/add-cluster-var branch from dbf3830 to 34e408b Compare June 10, 2020 11:31

markmandel reviewed Jun 16, 2020

View reviewed changes

Merge branch 'master' into e2e/add-cluster-var

d10057b

aLekSer mentioned this pull request Jun 16, 2020

Move support from Helm 2 ➡ Helm 3 #1436

Closed

markmandel approved these changes Jun 22, 2020

View reviewed changes

google-oss-robot assigned markmandel Jun 22, 2020

google-oss-robot added the lgtm label Jun 22, 2020

google-oss-robot added the approved label Jun 22, 2020

markmandel added this to the 1.7.0 milestone Jun 22, 2020

Merge branch 'master' into e2e/add-cluster-var

9e50640

google-oss-robot removed the lgtm label Jun 22, 2020

markmandel merged commit 91a9d9a into googleforgames:master Jun 23, 2020

markmandel added kind/feature New features for Agones and removed kind/breaking Breaking change labels Jun 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CI: Adding E2E cluster name as a parameter for CloudBuild #1611

CI: Adding E2E cluster name as a parameter for CloudBuild #1611

aLekSer commented Jun 3, 2020 •

edited

agones-bot commented Jun 3, 2020

agones-bot commented Jun 3, 2020

aLekSer commented Jun 3, 2020 •

edited

agones-bot commented Jun 3, 2020

agones-bot commented Jun 3, 2020

markmandel Jun 3, 2020

aLekSer Jun 4, 2020 •

edited

markmandel Jun 8, 2020

aLekSer Jun 10, 2020 •

edited

aLekSer Jun 10, 2020

markmandel Jun 16, 2020

aLekSer Jun 16, 2020

markmandel Jun 16, 2020

aLekSer Jun 16, 2020

aLekSer Jun 16, 2020

markmandel left a comment

google-oss-robot commented Jun 22, 2020

google-oss-robot commented Jun 22, 2020

agones-bot commented Jun 23, 2020

agones-bot commented Jun 23, 2020

CI: Adding E2E cluster name as a parameter for CloudBuild #1611

CI: Adding E2E cluster name as a parameter for CloudBuild #1611

Conversation

aLekSer commented Jun 3, 2020 • edited

agones-bot commented Jun 3, 2020

agones-bot commented Jun 3, 2020

aLekSer commented Jun 3, 2020 • edited

agones-bot commented Jun 3, 2020

agones-bot commented Jun 3, 2020

Choose a reason for hiding this comment

aLekSer Jun 4, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aLekSer Jun 10, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

markmandel left a comment

Choose a reason for hiding this comment

google-oss-robot commented Jun 22, 2020

google-oss-robot commented Jun 22, 2020

agones-bot commented Jun 23, 2020

agones-bot commented Jun 23, 2020

aLekSer commented Jun 3, 2020 •

edited

aLekSer commented Jun 3, 2020 •

edited

aLekSer Jun 4, 2020 •

edited

aLekSer Jun 10, 2020 •

edited