libcloud: build and replicate aws-winli images for supported streams#1134
libcloud: build and replicate aws-winli images for supported streams#1134marmijo merged 1 commit intocoreos:mainfrom
Conversation
marmijo
force-pushed
the
build-aws-winli
branch
3 times, most recently
from
551596f to
25f16c6
Compare
marmijo
force-pushed
the
build-aws-winli
branch
2 times, most recently
from
a3287bb to
70f1779
Compare
marmijo
force-pushed
the
build-aws-winli
branch
4 times, most recently
from
05663a8 to
163550d
Compare
| shwrap(""" | ||
| cosa buildfetch --build=${buildID} \ | ||
| --arch=x86_64 --artifact=aws --url=s3://${s3_stream_dir}/builds \ | ||
| --aws-config-file \${AWS_CONFIG_FILE} \ | ||
| && cosa decompress --build=${buildID} --artifact=aws | ||
| """) |
There was a problem hiding this comment.
Since this is an artificial requirement in this case how about we just touch /path/to/foo.vmdk.gz here and then delete the empty file when we're done with the upload
There was a problem hiding this comment.
SGTM, I updated the PR to grab the file name from the metadata and then touch it just before creating the AMI.
marmijo
force-pushed
the
build-aws-winli
branch
3 times, most recently
from
309369e to
f6e8abb
Compare
| // file to satisfy ore aws upload, which still requires the file in the | ||
| // cosa working dir. |
There was a problem hiding this comment.
to be clear here. it's not actually ore it's the cosalib wrapper that checks to see if we "have the artifact" before attempting to upload.
There was a problem hiding this comment.
Thanks! I updated the comments.
| // cosa working dir. | ||
| def s3_stream_dir = pipeutils.get_s3_streams_dir(pipecfg, stream) | ||
| shwrap(""" | ||
| touch builds/${buildID}/${basearch}/${aws_image_name} |
There was a problem hiding this comment.
Should we clean this up when we're done running cosa imageupload-aws? Not sure if it might cause any issues (i.e. wouldn't want this empty file to get uploaded back overtop the actual file somehow).
There was a problem hiding this comment.
That's a good idea. I updated the PR to include a rm command on it. I dont think it would be uploaded since this is the replicate portion of the code, but it's better to be safe!
dustymabe
left a comment
dustymabe
left a comment
There was a problem hiding this comment.
LGTM.
WDYT about waiting to merge this when the FCOS releases are done?
marmijo
force-pushed
the
build-aws-winli
branch
2 times, most recently
from
0c27708 to
79a7d10
Compare
| // Since we are not uploading anything, let's just touch the vmdk image | ||
| // file to satisfy the cosa ore wrapper, which still requires the file | ||
| // in the cosa working dir. | ||
| aws_image_path = "builds/${buildID}/${basearch}/${aws_image_name}" |
There was a problem hiding this comment.
| aws_image_path = "builds/${buildID}/${basearch}/${aws_image_name}" | |
| def aws_image_path = "builds/${buildID}/${basearch}/${aws_image_name}" |
??
Expand the replicate to clouds functionality to build AWS Windows License Included (winli) images for streams that support it before replicating AMIs to other regions. `cosa aws-replicate` will now replicate both traditional AMIs and aws-winli AMIs if present in the metadata. See: coreos/coreos-assembler#4069 Also add `create_and_replicate_winli_ami` as a stream level knob to the pipeline config to enable building and replicating the AMIs for specific streams.
marmijo
force-pushed
the
build-aws-winli
branch
from
79a7d10 to
d09c076
Compare
2 participants
Expand the replicate to clouds functionality to build AWS Windows License Included (winli) images for streams that support it before replicating AMIs to other regions.
cosa aws-replicatewill now replicate both traditional AMIs and aws-winli AMIs if present in the metadata.See: coreos/coreos-assembler#4069
Also add a
winliknob to the pipeline config clouds.aws section to only build winli images for specific streams.