diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-28 16:22:22 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-08-30 09:46:43 -0400 |
| commit | 704c4c171f2e038477e1f30fe36d540f348775fc (patch) | |
| tree | 2da0fe358fd6fe389bc1cf24bd9f17af3c8d14ec | |
| parent | 3e0fdc7f7a7435ccf80795a3c2e57c2a8ce28aed (diff) | |
| download | podman-704c4c171f2e038477e1f30fe36d540f348775fc.tar.gz podman-704c4c171f2e038477e1f30fe36d540f348775fc.tar.bz2 podman-704c4c171f2e038477e1f30fe36d540f348775fc.zip | |
Cirrus: Remove image_prune YAML-alias workaround
Originally when written, the image_prune_task was passing incorrect
credentials into it's container. This was traced back to mishandling of
a YAML-alias, and worked-around (including a comment). However,
as of this commit, it appear YAML-alias substitution problem has
been addressed. Restore the (correct) use of a YAML-alias so
the correct credentials are passed into the prune container.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 8d915fbfe..a1838c682 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -299,11 +299,9 @@ image_prune_task: memory: 1 env: - # order is significant, Cirrus not always overriding alias values as intended + <<: *meta_env_vars GCPJSON: ENCRYPTED[4c11d8e09c904c30fc70eecb95c73dec0ddf19976f9b981a0f80f3f6599e8f990bcef93c253ac0277f200850d98528e7] GCPNAME: ENCRYPTED[7f54557ba6e5a437f11283a53e71baec9ca546f48a9835538cc54d297f79968eb1337d4596a1025b14f9d1c5723fbd29] - GCPPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f] - <<: *meta_env_vars timeout_in: 10m |