Skip to content
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.

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

Sync v1 #1840

Merged
merged 10 commits into from
Jan 3, 2022
Merged

Sync v1 #1840

merged 10 commits into from
Jan 3, 2022

Conversation

carolynvs
Copy link
Member

@carolynvs carolynvs commented Nov 23, 2021

Merge branch 'main' into release/v1

adnxn and others added 10 commits October 11, 2021 08:43
* update parameters doc with allowable types

Signed-off-by: “adnan” <adnankhan021@gmail.com>

* to squash: address wording issues

Signed-off-by: “adnan” <adnankhan021@gmail.com>

* to squash: add parameters-type section

Signed-off-by: “adnan” <adnankhan021@gmail.com>
Signed-off-by: Parmeshwar Patidar <prm.mehul@gmail.com>
When cnab-to-oci fixes up a bundle after publishing it, if any error
occurs we only get a single error message

"failed to fixup the image for service InvocationImage"

This bumps our cnab-to-oci to use the patch in

cnabio/cnab-to-oci#113

so that we get a more detailed error message that indicates the image
that failed, and which fixup step.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Improve error message when cnab-to-oci fixes up a bundle
Signed-off-by: Avinash Upadhyaya <avinashupadhya99@gmail.com>
Signed-off-by: Avinash Upadhyaya <avinashupadhya99@gmail.com>
* adding PushBundleWithRelocationMap function

Signed-off-by: Anjay Ajodha <anajod@microsoft.com>

* Add a smoke test for porter copy

Validate that we are using the relocation map when copying the bundle.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

* Cherry-pick test improvements from main

I've cherry-picked some test improvements from main to help with the new
porter copy test:

* track the repo root and always use absolute paths to avoid problems
caused by tests that change directories

I've also added the last assert in the copy test that was accidentally
not included in the prior commit.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

* Added reloMap parameter into PushBundle

* Initialize relocation map before pushing

* Ensure that the relocation map is initialized (not null) before
calling into cnab-to-oci since it assumes the map is not null

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

* Remove unused test helper

We refactored the existing function so this variation isn't needed
anymore.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

Co-authored-by: Carolyn Van Slyck <me@carolynvanslyck.com>
* Fix Pushing Bundles that have a relocationMap (getporter#1815)
* chore: add avinashupadhya99 to Contributors.md
* docs: remove accidental packr word from contribution guide
* Improve error message when cnab-to-oci fixes up a bundle
* docs: fix command in contrib tutorial
* docs: update parameters doc with allowable types (getporter#1792)

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
@carolynvs
Copy link
Member Author

/azp run porter-integration

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@carolynvs carolynvs marked this pull request as ready for review January 3, 2022 16:23
@carolynvs carolynvs merged commit fdeebb9 into getporter:release/v1 Jan 3, 2022
@carolynvs carolynvs deleted the sync-v1 branch January 3, 2022 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants