Skip to content

Commit 1075bcc

Browse files
author
git
committed
Merge branch 'main' of github.com:cloudfoundry/bosh into HEAD
2 parents 7e6b620 + 1cf958b commit 1075bcc

2 files changed

Lines changed: 33 additions & 30 deletions

File tree

ci/pipeline.yml

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ anchors:
44
- &brats_env_name brats-bosh-main
55
- &ubuntu_base ubuntu:noble
66
- &integration_image ghcr.io/cloudfoundry/bosh/integration
7+
- &director_ruby_version ruby-3.3
8+
- &git_user_name CF-Bosh CI-Bot
9+
- &git_user_email cf-bosh-ci-bot@localhost
710

811
groups:
912
- name: bosh
@@ -992,8 +995,8 @@ jobs:
992995
input_mapping:
993996
release_repo: bosh
994997
params:
995-
GIT_USER_NAME: CF-Bosh CI-Bot
996-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
998+
GIT_USER_NAME: *git_user_name
999+
GIT_USER_EMAIL: *git_user_email
9971000
PRIVATE_YML: |
9981001
blobstore:
9991002
options:
@@ -1290,9 +1293,9 @@ jobs:
12901293
output-repo: bosh-out
12911294
params:
12921295
GEM_DIRS: src
1293-
GIT_USER_NAME: CF-Bosh CI-Bot
1294-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1295-
PACKAGE: ruby-3.3
1296+
GIT_USER_NAME: *git_user_name
1297+
GIT_USER_EMAIL: *git_user_email
1298+
PACKAGE: *director_ruby_version
12961299
VENDOR: true
12971300
VENDOR_PATH: vendor/cache
12981301
- task: test
@@ -1390,8 +1393,8 @@ jobs:
13901393
output_mapping:
13911394
bosh: bosh-out
13921395
params:
1393-
GIT_USER_NAME: CF-Bosh CI-Bot
1394-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1396+
GIT_USER_NAME: *git_user_name
1397+
GIT_USER_EMAIL: *git_user_email
13951398
PRIVATE_YML: |
13961399
blobstore:
13971400
options:
@@ -1406,8 +1409,8 @@ jobs:
14061409
output_mapping:
14071410
bosh: bosh-out
14081411
params:
1409-
GIT_USER_NAME: CF-Bosh CI-Bot
1410-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1412+
GIT_USER_NAME: *git_user_name
1413+
GIT_USER_EMAIL: *git_user_email
14111414
MAJOR_VERSION: 13
14121415
PRIVATE_YML: |
14131416
blobstore:
@@ -1423,8 +1426,8 @@ jobs:
14231426
output_mapping:
14241427
bosh: bosh-out
14251428
params:
1426-
GIT_USER_NAME: CF-Bosh CI-Bot
1427-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1429+
GIT_USER_NAME: *git_user_name
1430+
GIT_USER_EMAIL: *git_user_email
14281431
MAJOR_VERSION: 15
14291432
PRIVATE_YML: |
14301433
blobstore:
@@ -1438,9 +1441,9 @@ jobs:
14381441
output_mapping:
14391442
bosh-release: bosh-out
14401443
params:
1441-
GIT_USER_NAME: CF-Bosh CI-Bot
1442-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1443-
PACKAGE: ruby-3.3
1444+
GIT_USER_NAME: *git_user_name
1445+
GIT_USER_EMAIL: *git_user_email
1446+
PACKAGE: *director_ruby_version
14441447
PACKAGE_PREFIX: "director"
14451448
PRIVATE_YML: |
14461449
blobstore:
@@ -1458,8 +1461,8 @@ jobs:
14581461
bosh: bosh-out
14591462
params:
14601463
BLOBSTORE_TYPE: dav
1461-
GIT_USER_NAME: CF-Bosh CI-Bot
1462-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1464+
GIT_USER_NAME: *git_user_name
1465+
GIT_USER_EMAIL: *git_user_email
14631466
PRIVATE_YML: |
14641467
blobstore:
14651468
options:
@@ -1475,8 +1478,8 @@ jobs:
14751478
bosh: bosh-out
14761479
params:
14771480
BLOBSTORE_TYPE: gcs
1478-
GIT_USER_NAME: CF-Bosh CI-Bot
1479-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1481+
GIT_USER_NAME: *git_user_name
1482+
GIT_USER_EMAIL: *git_user_email
14801483
PRIVATE_YML: |
14811484
blobstore:
14821485
options:
@@ -1492,8 +1495,8 @@ jobs:
14921495
bosh: bosh-out
14931496
params:
14941497
BLOBSTORE_TYPE: s3
1495-
GIT_USER_NAME: CF-Bosh CI-Bot
1496-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1498+
GIT_USER_NAME: *git_user_name
1499+
GIT_USER_EMAIL: *git_user_email
14971500
PRIVATE_YML: |
14981501
blobstore:
14991502
options:
@@ -1509,8 +1512,8 @@ jobs:
15091512
bosh: bosh-out
15101513
params:
15111514
BLOBSTORE_TYPE: azure-storage
1512-
GIT_USER_NAME: CF-Bosh CI-Bot
1513-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1515+
GIT_USER_NAME: *git_user_name
1516+
GIT_USER_EMAIL: *git_user_email
15141517
PRIVATE_YML: |
15151518
blobstore:
15161519
options:
@@ -1524,8 +1527,8 @@ jobs:
15241527
output_mapping:
15251528
bosh: bosh-out
15261529
params:
1527-
GIT_USER_NAME: CF-Bosh CI-Bot
1528-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1530+
GIT_USER_NAME: *git_user_name
1531+
GIT_USER_EMAIL: *git_user_email
15291532
PRIVATE_YML: |
15301533
blobstore:
15311534
options:
@@ -1539,8 +1542,8 @@ jobs:
15391542
output_mapping:
15401543
bosh: bosh-out
15411544
params:
1542-
GIT_USER_NAME: CF-Bosh CI-Bot
1543-
GIT_USER_EMAIL: cf-bosh-ci-bot@localhost
1545+
GIT_USER_NAME: *git_user_name
1546+
GIT_USER_EMAIL: *git_user_email
15441547
PRIVATE_YML: |
15451548
blobstore:
15461549
options:

config/blobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ s3cli/s3cli-0.0.400-linux-amd64:
3434
size: 16177021
3535
object_id: 33aef574-8f7b-4bac-5b9c-57b195a45f19
3636
sha: sha256:6e887547fc0359b59130fcf6eee2359f29c9288b44dbabdde416e9271305d0a8
37-
verify-multidigest/verify-multidigest-0.0.605-linux-amd64:
38-
size: 4303703
39-
object_id: 607672d7-80e3-46e0-61ec-262a8ed46dd7
40-
sha: sha256:38090dce3062fac04023e0edae3cbe80cfdec0d9a2f031e6986f2f31b9569590
37+
verify-multidigest/verify-multidigest-0.0.607-linux-amd64:
38+
size: 4303791
39+
object_id: c22c81f9-6822-4bfd-57c2-e838f86bf2ed
40+
sha: sha256:370469b7999f8891fe8da767d24dd63e2e1a6eca812ab364afb94fa8dea9e37f

0 commit comments

Comments
 (0)