Skip to content

Commit 307a85e

Browse files
author
Ace Nassri
authored
Fix Jenkins build failing due to version collisions (GoogleCloudPlatform#102)
* Fix worker version collisions * Attempt to fix Travis by removing port collisions * Travis: fix ports not being recognized by worker apps
1 parent 2d6ab6f commit 307a85e

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

6-pubsub/test/config.worker.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515

1616
const path = require(`path`);
1717
const projectId = process.env.GCLOUD_PROJECT;
18-
const test = `6-pubsub`;
18+
const test = `6-pubsub-worker`;
19+
const port = 8091;
1920

2021
module.exports = {
2122
test: test,
22-
url: `http://localhost:8081`,
23+
url: `http://localhost:${port}`,
2324
demoUrl: `http://${test}-dot-worker-dot-${projectId}.appspot-preview.com`,
2425
yaml: `worker.yaml`,
2526
cwd: path.resolve(path.join(__dirname, `../`)),
2627
cmd: `node`,
2728
args: [`worker.js`],
2829
msg: `This worker has processed`,
30+
port: port,
2931
env: {
30-
PORT: 8081,
3132
SUBSCRIPTION_NAME: `shared-worker-subscription-${test}`,
3233
TOPIC_NAME: `book-process-queue-${test}`
3334
}

7-gce/test/config.worker.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515

1616
const path = require(`path`);
1717
const projectId = process.env.GCLOUD_PROJECT;
18-
const test = `7-gce`;
18+
const test = `7-gce-worker`;
19+
const port = 8092;
1920

2021
module.exports = {
2122
test: test,
22-
url: `http://localhost:8081`,
23+
url: `http://localhost:${port}`,
2324
demoUrl: `http://${test}-dot-worker-dot-${projectId}.appspot-preview.com`,
2425
yaml: `worker.yaml`,
2526
cwd: path.resolve(path.join(__dirname, `../`)),
2627
cmd: `node`,
2728
args: [`worker.js`],
2829
msg: `This worker has processed`,
30+
port: port,
2931
env: {
30-
PORT: 8081,
3132
SUBSCRIPTION_NAME: `shared-worker-subscription-${test}`,
3233
TOPIC_NAME: `book-process-queue-${test}`
3334
}

optional-container-engine/test/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
'use strict';
1515

1616
const path = require(`path`);
17-
const test = `7-gce`;
17+
const test = `optional-container-engine`;
1818

1919
module.exports = {
2020
test: test,

optional-container-engine/test/config.worker.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515

1616
const path = require(`path`);
1717
const projectId = process.env.GCLOUD_PROJECT;
18-
const test = `7-gce`;
18+
const test = `optional-container-engine-worker`;
19+
const port = 8093;
1920

2021
module.exports = {
2122
test: test,
22-
url: `http://localhost:8081`,
23+
url: `http://localhost:${port}`,
2324
demoUrl: `http://${test}-dot-worker-dot-${projectId}.appspot-preview.com`,
2425
yaml: `worker.yaml`,
2526
cwd: path.resolve(path.join(__dirname, `../`)),
2627
cmd: `node`,
2728
args: [`worker.js`],
2829
msg: `This worker has processed`,
30+
port: port,
2931
env: {
30-
PORT: 8081,
3132
SUBSCRIPTION_NAME: `shared-worker-subscription-${test}`,
3233
TOPIC_NAME: `book-process-queue-${test}`
3334
}

0 commit comments

Comments
 (0)