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

Merge MRO #271

Merged
merged 487 commits into from
Apr 27, 2020
Merged

Merge MRO #271

merged 487 commits into from
Apr 27, 2020

Conversation

michaelsauter
Copy link
Member

@michaelsauter michaelsauter commented Apr 27, 2020

Merges https://github.com/opendevstack/ods-mro-jenkins-shared-library into this repo, preserving the history of the MRO repo.

Closes opendevstack/ods-mro-jenkins-shared-library#104.

As the diff is impossible to review, here's a summary of what I've done:

  • Merge commits (d90641c). There were only a few conflicts. I solved the conflict on the README.md by creating a new document under docs for the orchestration pipeline.
  • Rename mroPipeline to odsOrchestrationPipeline (7037ad8)
  • Move all packages from MRO in package org.ods into org.ods.orchestration (in 596928b, tests moved in c89e93c)
  • Move all "phases" in vars/ to stages in org.ods.orchestration (7e30ebe)
  • Make use of the super stage to contain the try/catch logic with reporting back to Jira (dadf8df)
  • Move runOnAgentPod into super stage (660a27b)
  • Fix issues that occurred due to the merge (5eb4238, and a regression on MRO master in
    313787d)

Far from being complete, but this allows to use the orchestration pipeline like this:

@Library('ods-jenkins-shared-library@master') _
odsOrchestrationPipeline(
  debug: true,
  odsImageTag: 'master'
)

I've recorded a few follow-up items: #272, #273, #274, #275 and #276 which should cover most things related to the merge of the two libraries.

I propose to merge this quickly to unblock contributions to the MRO again.

metmajer and others added 30 commits January 23, 2020 18:17
* Add support for component metadata in metadata.yml
* Consider only automated tests with status Ready to Test
* Report bugs only in Q and P
* Re-add missing reports to overall TIR
* Apply static document header from metadata
…iceRegistry-typed

make ServiceRegistry typed
@clemensutschig clemensutschig self-requested a review April 27, 2020 13:53
Copy link
Member

@clemensutschig clemensutschig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonderfull

@metmajer
Copy link
Member

Fantastic @michaelsauter! Did you run a release manager pipeline with the new codebase already? Ping me on IM if you like.

@michaelsauter
Copy link
Member Author

@metmajer Yes. Assembling (WIP and version) worked, and promotion as well. I did not test the Jira integration, but since I did not any changes there things should work :)

@michaelsauter michaelsauter merged commit fdf2670 into opendevstack:master Apr 27, 2020
@michaelsauter michaelsauter deleted the feature/mro-merge branch April 27, 2020 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge into ods-jenkins-shared-library
8 participants