Skip to content

Commit e8f8de7

Browse files
authored
Merge pull request #2 from cloudfoundry-community/24Q3-worker-go
24 q3 worker go
2 parents a7f2913 + ee425a4 commit e8f8de7

File tree

17 files changed

+86
-10
lines changed

17 files changed

+86
-10
lines changed

.final_builds/jobs/scheduler/index.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ builds:
77
version: 715a2b86a497d7e5ac0d7c540831d0f3192559483512763cdac39ab2976290d6
88
blobstore_id: cc3d6072-5e7f-418f-46af-8569b59b8950
99
sha1: sha256:c8fb3b6f2381d3f507a1868041984fd6619bf2881218ae6db8f7463a49dc538b
10+
d2cdeacec1366de99a221c4b1989c56e841311119981d72bbc84436c1c3e9cd3:
11+
version: d2cdeacec1366de99a221c4b1989c56e841311119981d72bbc84436c1c3e9cd3
12+
blobstore_id: 2c6c1295-bfad-4e47-59cd-21eebc5a1801
13+
sha1: sha256:957bdad9e2e51c5c6c4186a93ea31ced39c8ae1fdac92a74911cfcae3e6fac04
1014
format-version: "2"

.final_builds/jobs/smoke-tests/index.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ builds:
1515
version: 3e397bd6b01d0f16122aef106790f1e9eda2bd2e0702fd51106f827eac9347b4
1616
blobstore_id: 91833fc5-61b9-4321-52dd-d324d2d42b5b
1717
sha1: sha256:f9825b4bdc12b07f5b668026d43caa92b8d48d93bd4368a868aac97b617ac623
18+
b403a7fc9ef4ee4bb264fd83a087fb5aaa321b8038bbc490c5aedae467828391:
19+
version: b403a7fc9ef4ee4bb264fd83a087fb5aaa321b8038bbc490c5aedae467828391
20+
blobstore_id: 9e063b25-c258-4ffa-71e3-8ddc5182eba0
21+
sha1: sha256:e06f9970113f517cb9e9c7a7350ad883e3b0f2764539efa0534b0de73ecc0614
1822
format-version: "2"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
builds:
2+
65e1dbda6b56080be4108e94c744f40bb2dca4caa417ab9fb376c2c353bdff1c:
3+
version: 65e1dbda6b56080be4108e94c744f40bb2dca4caa417ab9fb376c2c353bdff1c
4+
blobstore_id: e93541b8-7d7b-4537-4bb0-54665b244ba2
5+
sha1: sha256:7b20eaca465629e9195699e069545ab655584778c7b573f3f710e0f4915a3bf5
6+
format-version: "2"

.final_builds/packages/scheduler/index.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ builds:
1111
version: 4ae2b8bd0d9e51100ced77f5c6b22fb943705fefc227882e6019981544dfd003
1212
blobstore_id: 69b46068-2cda-497e-70ef-79b272588d12
1313
sha1: sha256:c38ed994b294c63c4db4083670352ce86148a48e5884b8968665af15aaffc371
14+
74c63f118db88f185fb8ae77f725ec9decc266c3d987ac91a40d3a54fb4aeb56:
15+
version: 74c63f118db88f185fb8ae77f725ec9decc266c3d987ac91a40d3a54fb4aeb56
16+
blobstore_id: 5bd62722-58f2-48e0-5595-2a5ee7710dd8
17+
sha1: sha256:b94737f60cef10cbb30afc1e4ad1b427b165d1f9fceca65aa55e96806bd43a03
1418
87b0f448eb77bbb4250595a062446dedc6d8a25067d571cb64799088b31cbf64:
1519
version: 87b0f448eb77bbb4250595a062446dedc6d8a25067d571cb64799088b31cbf64
1620
blobstore_id: f826b61b-32a1-458e-6e3a-f6f312bbdffa

.final_builds/packages/smoke-tests/index.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
builds:
2+
9819c5ab50f1a84c46f0e11c1d5948e562e2cab36f4e42e8aaacfc4ff304d1eb:
3+
version: 9819c5ab50f1a84c46f0e11c1d5948e562e2cab36f4e42e8aaacfc4ff304d1eb
4+
blobstore_id: c4413170-5d42-4e65-54c7-cd4a6f91ddce
5+
sha1: sha256:6f32f681bf743494299055c55ecd0df1e5c7e2ac84e72d89ca559760f68a47ea
26
bd568015c992f4d8083f499412917df21551e880cad5896ea397cece8a6cd8c8:
37
version: bd568015c992f4d8083f499412917df21551e880cad5896ea397cece8a6cd8c8
48
blobstore_id: 2af5e3ae-38bd-474d-491a-0438cb28813e

jobs/scheduler/templates/env.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export CLIENT_ID="<%= p('scheduler.uaa.client_id') %>"
55
export UAA_ENDPOINT="<%= p('scheduler.uaa.endpoint') %>"
66
export DATABASE_URL="<%= p('scheduler.postgres.uri') %>"
77
export CF_ENDPOINT="<%= p('scheduler.cf.api')%>"
8-
export workerNum="<%= p('scheduler.workers')%>"
8+
export WORKER_NUM ="<%= p('scheduler.workers')%>"
99
export LOG_LEVEL="<%= p('scheduler.log_level')%>"
1010

1111

jobs/smoke-tests/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ templates:
77

88
packages:
99
- smoke-tests
10-
- golang-1.20-linux
10+
- golang-1.22-linux
1111
- cf-cli-8-linux
1212
- scheduler-cf-plugin
1313

jobs/smoke-tests/templates/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
# Prepare PATH with known bin directories.
66
export PATH=$PATH:/var/vcap/packages/cf-cli-8-linux/bin
7-
export PATH=$PATH:/var/vcap/packages/golang-1.20-linux/bin
7+
export PATH=$PATH:/var/vcap/packages/golang-1.22-linux/bin
88

99
echo "==="
1010
echo "Setting up CF CLI environment..."
@@ -44,7 +44,7 @@ yes | cf install-plugin /var/vcap/packages/scheduler-cf-plugin/bin/scheduler-cf-
4444

4545
echo "==="
4646
echo "Preparing Go runtime environment..."
47-
source /var/vcap/packages/golang-1.20-linux/bosh/runtime.env
47+
source /var/vcap/packages/golang-1.22-linux/bosh/runtime.env
4848
export CGO_ENABLED=0
4949

5050
echo "==="

packages/golang-1.20-linux/spec.lock

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name: golang-1.22-linux
2+
fingerprint: 65e1dbda6b56080be4108e94c744f40bb2dca4caa417ab9fb376c2c353bdff1c

0 commit comments

Comments
 (0)