Skip to content

Commit

Permalink
Merge pull request #342 from miabbott/skopeo_delete_is_not_untag
Browse files Browse the repository at this point in the history
aws-test: don't use `skopeo delete` to untag images
  • Loading branch information
openshift-merge-robot authored Oct 2, 2018
2 parents 2349764 + 53df05b commit ed01490
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Jenkinsfile.aws-test
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ node(NODE) {
sh """
# Do testing with intermediate aws image passed in by cloud job
if ! kola -b rhcos -p aws --aws-type t2.small --tapfile rhcos-aws.tap --aws-ami ${ami_intermediate} --aws-region ${AWS_REGION} -j ${NUM_VMS} run; then
# if the tests fail, GC the container image tagged with the ostree commit
skopeo delete docker://${OSCONTAINER_IMG}:${ostree_commit}
exit 1
fi

Expand Down Expand Up @@ -102,9 +100,8 @@ node(NODE) {
${WORKSPACE}/aws.json \
s3://${S3_PUBLIC_BUCKET}/aws-tested.json

# Copy the container image to alpha, then GC the image tagged with the ostree commit
# Copy the container image to alpha
skopeo copy docker://${OSCONTAINER_IMG}:${ostree_commit} docker://${OSCONTAINER_IMG}:alpha
skopeo delete docker://${OSCONTAINER_IMG}:${ostree_commit}
"""
}
}
Expand Down

0 comments on commit ed01490

Please sign in to comment.