Skip to content

Commit b2c851a

Browse files
authored
chore: stop pre-building binaries in e2e tests (#430)
1 parent 9bc2078 commit b2c851a

File tree

8 files changed

+7
-118
lines changed

8 files changed

+7
-118
lines changed

handwritten/cloud-profiler/testing/integration_test.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ var (
3939
commit = flag.String("commit", "", "git commit to test")
4040
pr = flag.Int("pr", 0, "git pull request to test")
4141
runOnlyV8CanaryTest = flag.Bool("run_only_v8_canary_test", false, "if true test will be run only with the v8-canary build, otherwise, no tests will be run with v8 canary")
42-
binaryHost = flag.String("binary_host", "", "host from which to download precompiled binaries; if no value is specified, binaries will be built from source.")
4342

4443
runID = strings.Replace(time.Now().Format("2006-01-02-15-04-05.000000-0700"), ".", "-", -1)
4544
benchFinishString = "busybench finished profiling"
@@ -74,7 +73,7 @@ set -eo pipefail
7473
set -x
7574
# Install git
7675
retry apt-get update >/dev/null
77-
retry apt-get -y -q install git {{if not .BinaryHost}}build-essential{{end}} >/dev/null
76+
retry apt-get -y -q install git build-essential >/dev/null
7877
7978
# Install desired version of Node.js
8079
retry curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash >/dev/null
@@ -95,7 +94,7 @@ retry git fetch origin {{if .PR}}pull/{{.PR}}/head{{else}}{{.Branch}}{{end}}:pul
9594
git checkout pull_branch
9695
git reset --hard {{.Commit}}
9796
98-
retry npm install --nodedir="$NODEDIR" {{if.BinaryHost}}--fallback-to-build=false --google_cloud_profiler_binary_host_mirror={{.BinaryHost}}{{end}} >/dev/null
97+
retry npm install --nodedir="$NODEDIR" >/dev/null
9998
10099
# TODO: remove this workaround.
101100
# For v8-canary tests, we need to use the version of NAN on github, which
@@ -114,11 +113,7 @@ cp -r "testing/busybench" "$TESTDIR"
114113
cd "$TESTDIR/busybench"
115114
116115
retry npm install node-pre-gyp
117-
{{if .BinaryHost}}
118-
retry npm install --nodedir="$NODEDIR" --fallback-to-build=false --google_cloud_profiler_binary_host_mirror={{.BinaryHost}} "$PROFILER" typescript gts >/dev/null
119-
{{else}}
120116
retry npm install --nodedir="$NODEDIR" --build-from-source=google_cloud_profiler "$PROFILER" typescript gts >/dev/null
121-
{{end}}
122117
123118
npm run compile
124119
@@ -159,7 +154,6 @@ func (tc *nodeGCETestCase) initializeStartUpScript(template *template.Template)
159154
Commit string
160155
FinishString string
161156
ErrorString string
162-
BinaryHost string
163157
}{
164158
Service: tc.name,
165159
NodeVersion: tc.nodeVersion,
@@ -170,7 +164,6 @@ func (tc *nodeGCETestCase) initializeStartUpScript(template *template.Template)
170164
Commit: *commit,
171165
FinishString: benchFinishString,
172166
ErrorString: errorString,
173-
BinaryHost: *binaryHost,
174167
})
175168
if err != nil {
176169
return fmt.Errorf("failed to render startup script for %s: %v", tc.name, err)

handwritten/cloud-profiler/testing/integration_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ cp -R "testing" "$GOPATH/src/proftest"
3434
cd "$GOPATH/src/proftest"
3535
retry go get -t -d -tags=integration .
3636
if [ "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" = "" ]; then
37-
go test -timeout=30m -tags=integration -run TestAgentIntegration -commit="$COMMIT" -branch="$BRANCH" -repo="$REPO" -run_only_v8_canary_test="$RUN_ONLY_V8_CANARY_TEST" -binary_host="$BINARY_HOST"
37+
go test -timeout=30m -tags=integration -run TestAgentIntegration -commit="$COMMIT" -branch="$BRANCH" -repo="$REPO" -run_only_v8_canary_test="$RUN_ONLY_V8_CANARY_TEST"
3838
else
39-
go test -timeout=30m -tags=integration -run TestAgentIntegration -commit="$COMMIT" -pr="$KOKORO_GITHUB_PULL_REQUEST_NUMBER" -run_only_v8_canary_test="$RUN_ONLY_V8_CANARY_TEST" -binary_host="$BINARY_HOST"
39+
go test -timeout=30m -tags=integration -run TestAgentIntegration -commit="$COMMIT" -pr="$KOKORO_GITHUB_PULL_REQUEST_NUMBER" -run_only_v8_canary_test="$RUN_ONLY_V8_CANARY_TEST"
4040
fi
4141

handwritten/cloud-profiler/tools/build.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

handwritten/cloud-profiler/tools/kokoro/continuous/continuous.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414

1515
# Location of the build script in this repository.
16-
build_file: "cloud-profiler-nodejs/tools/linux_build_and_test.sh"
16+
build_file: "cloud-profiler-nodejs/testing/integration_test.sh"

handwritten/cloud-profiler/tools/kokoro/presubmit/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414

1515
# Location of the build script in this repository.
16-
build_file: "cloud-profiler-nodejs/tools/linux_build_and_test.sh"
16+
build_file: "cloud-profiler-nodejs/testing/integration_test.sh"

handwritten/cloud-profiler/tools/kokoro/release/linux.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414

1515
# Location of the build script in this repository.
16-
build_file: "cloud-profiler-nodejs/tools/linux_build_and_test.sh"
16+
build_file: "cloud-profiler-nodejs/testing/integration_test.sh"

handwritten/cloud-profiler/tools/linux/Dockerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

handwritten/cloud-profiler/tools/linux_build_and_test.sh

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)