Skip to content

Commit f925fee

Browse files
committed
CI: tasks use bundle exec to run
Fixes ``` + rake build:aws rake aborted! LoadError: cannot load such file -- aws-sdk-s3 (LoadError) ```
1 parent fe029ef commit f925fee

File tree

9 files changed

+28
-26
lines changed
  • ci/tasks
    • aggregate-stemcells
    • copy-aws-stemcell
    • create-aws-stemcell
    • create-azure-stemcell
    • create-gcp-stemcell
    • label-aws-stemcell-for-production
    • label-gcp-stemcell-for-production
    • publish-gcp-stemcell
    • wait-for-ami-availability

9 files changed

+28
-26
lines changed

ci/tasks/aggregate-stemcells/run

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
2-
3-
set -ex
2+
set -eu -o pipefail
3+
set -x
44

55
AWS_CREDS_FILE=~/.aws/credentials
66
mkdir -p ~/.aws
@@ -11,9 +11,10 @@ aws_access_key_id = ${AWS_ACCESS_KEY}
1111
aws_secret_access_key = ${AWS_SECRET_KEY}
1212
EOF
1313

14-
cd stemcell-builder
15-
bundle install
16-
rake build:aws_aggregate
14+
pushd stemcell-builder
15+
bundle install
16+
bundle exec rake build:aws_aggregate
1717

18-
mv bosh-windows-stemcell/*.tgz ../bosh-windows-stemcell
19-
mv bosh-windows-stemcell/*.sha ../sha
18+
mv bosh-windows-stemcell/*.tgz ../bosh-windows-stemcell
19+
mv bosh-windows-stemcell/*.sha ../sha
20+
popd

ci/tasks/copy-aws-stemcell/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121

2222
pushd stemcell-builder
2323
bundle install
24-
rake build:aws_ami
24+
bundle exec rake build:aws_ami
2525

2626
mv copied-regional-stemcells/*.tgz ../copied-regional-stemcells
2727
popd

ci/tasks/create-aws-stemcell/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pushd stemcell-builder
3434
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
3535

3636
bundle install
37-
rake build:aws
37+
bundle exec rake build:aws
3838

3939
mv bosh-windows-stemcell/* ../bosh-windows-stemcell
4040

ci/tasks/create-azure-stemcell/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pushd stemcell-builder
1313
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
1414

1515
bundle install
16-
rake build:azure
16+
bundle exec rake build:azure
1717

1818
mv bosh-windows-stemcell/* ../bosh-windows-stemcell
1919

ci/tasks/create-gcp-stemcell/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pushd stemcell-builder
1313
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
1414

1515
bundle install
16-
rake build:gcp
16+
bundle exec rake build:gcp
1717

1818
mv bosh-windows-stemcell/* ../bosh-windows-stemcell
1919

ci/tasks/label-aws-stemcell-for-production/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
2-
3-
set -ex
2+
set -eu -o pipefail
3+
set -x
44

55
AWS_CREDS_FILE=~/.aws/credentials
66
mkdir -p ~/.aws
@@ -13,5 +13,5 @@ EOF
1313

1414
pushd stemcell-builder
1515
bundle install
16-
rake aws:label:for_production
16+
bundle exec rake aws:label:for_production
1717
popd
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
2+
set -eu -o pipefail
3+
set -x
24

3-
set -ex
4-
5-
cd stemcell-builder
6-
bundle install
7-
rake gcp:label:for_production
5+
pushd stemcell-builder
6+
bundle install
7+
bundle exec rake gcp:label:for_production
8+
popd

ci/tasks/publish-gcp-stemcell/run

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
set -eu -o pipefail
33
set -x
44

5-
cd stemcell-builder
6-
bundle install
7-
rake publish:gcp
8-
rake gcp:label:for_test
9-
cd ..
5+
pushd stemcell-builder
6+
bundle install
7+
bundle exec rake publish:gcp
8+
bundle exec rake gcp:label:for_test
9+
popd
1010

1111
mv bosh-windows-stemcell/*.tgz untested-stemcell

ci/tasks/wait-for-ami-availability/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ fi
1919

2020
pushd stemcell-builder
2121
bundle install
22-
rake build:validate_ami
23-
rake aws:label:for_test
22+
bundle exec rake build:validate_ami
23+
bundle exec rake aws:label:for_test
2424
popd

0 commit comments

Comments
 (0)