Skip to content

Commit 864e1cd

Browse files
committed
In ci pipeline upload the same dev release to each director.
[#137858551]
1 parent 8a645b1 commit 864e1cd

File tree

3 files changed

+47
-42
lines changed

3 files changed

+47
-42
lines changed

ci/pipelines/cf-upgrade.yml

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -68,62 +68,66 @@ jobs:
6868
BOSH_USER: {{fresh_bosh_user}}
6969
BOSH_PASSWORD: {{fresh_bosh_password}}
7070
BOSH_PUBLIC_IP: {{fresh_bosh_public_ip}}
71-
- task: upload-postgres-dev-release-fresh
72-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
73-
input_mapping: {dev-release: postgres-release}
74-
params:
75-
<<: *bosh_params_fresh
76-
REL_NAME: postgres
77-
REL_VERSION: v999+dev.1
78-
- task: upload-cf-dev-release-fresh
79-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
80-
input_mapping: {dev-release: cf-release}
81-
params:
82-
<<: *bosh_params_fresh
83-
REL_NAME: cf
84-
REL_VERSION: v999+dev.1
8571
- task: upload-stemcell-old
8672
file: postgres-release/ci/scripts/upload-stemcell/task.yml
8773
params: &bosh_params_old
8874
BOSH_DIRECTOR: {{old_bosh_director}}
8975
BOSH_USER: {{old_bosh_user}}
9076
BOSH_PASSWORD: {{old_bosh_password}}
9177
BOSH_PUBLIC_IP: {{old_bosh_public_ip}}
92-
- task: upload-postgres-dev-release-old
93-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
94-
input_mapping: {dev-release: postgres-release}
95-
params:
96-
<<: *bosh_params_old
97-
REL_NAME: postgres
98-
REL_VERSION: v999+dev.1
99-
- task: upload-cf-dev-release-old
100-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
101-
input_mapping: {dev-release: cf-release}
102-
params:
103-
<<: *bosh_params_old
104-
REL_NAME: cf
105-
REL_VERSION: v999+dev.1
10678
- task: upload-stemcell-older
10779
file: postgres-release/ci/scripts/upload-stemcell/task.yml
10880
params: &bosh_params_older
10981
BOSH_DIRECTOR: {{older_bosh_director}}
11082
BOSH_USER: {{older_bosh_user}}
11183
BOSH_PASSWORD: {{older_bosh_password}}
11284
BOSH_PUBLIC_IP: {{older_bosh_public_ip}}
113-
- task: upload-postgres-dev-release-older
114-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
85+
- task: create-postgres-dev-release-tarball
86+
file: postgres-release/ci/scripts/create-dev-release-tarball/task.yml
11587
input_mapping: {dev-release: postgres-release}
88+
output_mapping: {dev-release-tarball: postgres-tarball}
11689
params:
117-
<<: *bosh_params_older
90+
<<: *bosh_params_fresh
11891
REL_NAME: postgres
11992
REL_VERSION: v999+dev.1
120-
- task: upload-cf-dev-release-older
121-
file: postgres-release/ci/scripts/upload-dev-release/task.yml
93+
- task: create-cf-dev-release-tarball
94+
file: postgres-release/ci/scripts/create-dev-release-tarball/task.yml
12295
input_mapping: {dev-release: cf-release}
96+
output_mapping: {dev-release-tarball: cf-tarball}
12397
params:
124-
<<: *bosh_params_older
98+
<<: *bosh_params_fresh
12599
REL_NAME: cf
126100
REL_VERSION: v999+dev.1
101+
- task: upload-postgres-dev-release-fresh
102+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
103+
input_mapping: {dev-release-tarball: postgres-tarball}
104+
params:
105+
<<: *bosh_params_fresh
106+
- task: upload-cf-dev-release-fresh
107+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
108+
input_mapping: {dev-release-tarball: cf-tarball}
109+
params:
110+
<<: *bosh_params_fresh
111+
- task: upload-postgres-dev-release-old
112+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
113+
input_mapping: {dev-release-tarball: postgres-tarball}
114+
params:
115+
<<: *bosh_params_old
116+
- task: upload-cf-dev-release-old
117+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
118+
input_mapping: {dev-release-tarball: cf-tarball}
119+
params:
120+
<<: *bosh_params_old
121+
- task: upload-postgres-dev-release-older
122+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
123+
input_mapping: {dev-release-tarball: postgres-tarball}
124+
params:
125+
<<: *bosh_params_older
126+
- task: upload-cf-dev-release-older
127+
file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
128+
input_mapping: {dev-release-tarball: cf-tarball}
129+
params:
130+
<<: *bosh_params_older
127131

128132
- name: test-fresh-deployment
129133
serial_groups: [cf-fresh]

ci/scripts/upload-dev-release/task.sh renamed to ci/scripts/upload-dev-release-tarball/task.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ function main(){
1616
bosh login ${BOSH_USER} ${BOSH_PASSWORD}
1717
set -x
1818

19-
pushd ${root}/dev-release
20-
#git submodule update --init --recursive
21-
bosh -t ${BOSH_DIRECTOR} create release --force --version "${REL_VERSION}" --name "${REL_NAME}"
22-
bosh -t ${BOSH_DIRECTOR} upload release --version "${REL_VERSION}" --name "${REL_NAME}"
19+
pushd ${root}/dev-release-tarball
20+
for file in *.tgz
21+
do
22+
echo loading release "$file"
23+
bosh -t ${BOSH_DIRECTOR} upload release "$file"
24+
done
2325
popd
2426
}
2527

ci/scripts/upload-dev-release/task.yml renamed to ci/scripts/upload-dev-release-tarball/task.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ image_resource:
99

1010
inputs:
1111
- name: postgres-release
12-
- name: dev-release
12+
- name: dev-release-tarball
13+
1314

1415
run:
15-
path: postgres-release/ci/scripts/upload-dev-release/task.sh
16+
path: postgres-release/ci/scripts/upload-dev-release-tarball/task.sh
1617

1718
params:
1819
BOSH_DIRECTOR:
1920
BOSH_USER:
2021
BOSH_PASSWORD:
21-
REL_NAME:
22-
REL_VERSION:

0 commit comments

Comments
 (0)