Skip to content

Push tested ami json to public aws bucket #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 25, 2018
Merged

Push tested ami json to public aws bucket #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Jenkinsfile.aws-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ node(NODE) {
[$class: 'AmazonWebServicesCredentialsBinding', credentialsId: params.AWS_CREDENTIALS],
string(credentialsId: params.S3_PRIVATE_BUCKET, variable: 'S3_PRIVATE_BUCKET'),
string(credentialsId: params.AWS_CI_ACCOUNT, variable: 'AWS_CI_ACCOUNT'),
string(credentialsId: params.S3_PUBLIC_BUCKET, variable: 'S3_PUBLIC_BUCKET'),
]) {
currentBuild.description = "version=${version} ami=${ami_intermediate}"
sh """
Expand All @@ -62,6 +63,11 @@ node(NODE) {
aws ec2 modify-image-attribute \
--image-id ${ami_intermediate} \
--launch-permission '{"Add":[{"Group":"all"}]}'

# Upload the json file to a public location
aws s3 cp --acl public-read \
${images}/aws-${AWS_REGION}-tested.json \
s3://${S3_PUBLIC_BUCKET}/aws-${AWS_REGION}-tested.json
"""
}
}
Expand Down
5 changes: 5 additions & 0 deletions pipeline-utils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ def define_properties(timer) {
description: "(not secret) Private S3 bucket to use when uploading AMIs.",
defaultValue: '5c9571a2-c492-421f-b506-ba469afffc10',
required: true),
credentials(name: 'S3_PUBLIC_BUCKET',
credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
description: "(not secret) Public S3 bucket to push public files.",
defaultValue: '17f001fc-6b07-4233-aee2-3e8448459cf5',
required: true),
credentials(name: 'OSTREE_INSTALL_URL',
credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
description: "(not secret) Remote OSTree repo URL to install from when running imagefactory.",
Expand Down