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

Fix SDK conformance GRPC gateway test #1390

Merged
merged 3 commits into from
Mar 5, 2020
Merged

Fix SDK conformance GRPC gateway test #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f974192
Fix SDK conformance GRPC gateway test
aLekSer Mar 4, 2020
4ad0e28
Merge branch 'master' into fix/sdk-conformance-grpc-gateway
aLekSer Mar 5, 2020
c27dfa7
Merge branch 'master' into fix/sdk-conformance-grpc-gateway
markmandel Mar 5, 2020
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
4 changes: 2 additions & 2 deletions build/build-sdk-images/restapi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ ENV GOPATH /go
RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
tar -xzf go${GO_VERSION}.linux-amd64.tar.gz && rm go${GO_VERSION}.linux-amd64.tar.gz && mkdir -p ${GOPATH}

RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
apt-get install -y nodejs

RUN apt-get install -y openjdk-8-jre
RUN apt-get install -y openjdk-8-jre

ENV PATH /usr/local/go/bin:/go/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion build/build-sdk-images/restapi/clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

set -ex
rm -rf /go/src/agones.dev/agones/test/sdk/restapi/swagger
rm /go/src/agones.dev/agones/test/sdk/restapi/http-api-test.go
rm /go/src/agones.dev/agones/test/sdk/restapi/http-api-test.go || true
4 changes: 2 additions & 2 deletions test/sdk/restapi/http-api-test.go.nolint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func main() {

ctx := context.Background()

// Wait for SDK server to start the test (30 seconds)
for c := 0; c < 5; c++ {
// Wait for SDK server to start the test (15 seconds)
for c := 0; c < 15; c++ {
_, _, err := cli.SDKApi.Ready(ctx, swagger.SdkEmpty{})
if err == nil {
break
Expand Down