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

Feature/svc common usage (Jenkins / Nexus / GitService) #325

Merged

Conversation

clemensutschig
Copy link
Member

@clemensutschig clemensutschig commented May 9, 2020

  1. closes Move NexusService #274
  2. closes Move JenkinsService #275
  3. closes Merge GitUtil into GitService #285
  4. extracts logger into org.ods.util

This PR also ensures that common services are really shared at runtime (and not blindly overwritten in the 'component' pipeline) .. which uncovered a whole set of more issues (Pipelinesteps, NPE,.. :))

Tested both standalone (with flask and also in the MRO context) - both work now :)

@clemensutschig clemensutschig changed the title Feature/svc common usage Feature/svc common usage (Jenkins / Nexus) May 10, 2020
@clemensutschig clemensutschig changed the title Feature/svc common usage (Jenkins / Nexus) Feature/svc common usage (Jenkins / Nexus / GitService) May 11, 2020
@clemensutschig
Copy link
Member Author

@martsec @georgfedermann - fyi, the only thing that changed are packages ...

michaelsauter
michaelsauter previously approved these changes May 11, 2020
src/org/ods/component/Pipeline.groovy Outdated Show resolved Hide resolved
src/org/ods/orchestration/InitStage.groovy Outdated Show resolved Hide resolved
@@ -296,4 +296,11 @@ class OpenShiftService {
return images
}

String getOriginUrlFromBuildConfig (String project, String bcName) {
Copy link
Member

Choose a reason for hiding this comment

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

We could still use the instance variable project, right? I know that how it is used from the pipeline, here the project is e.g. foo-cd and for the other methods it is e.g. foo-dev, but that shouldn't matter. You anyway instantiate a new OpenShiftService just to call this method, so you can pass the project to the constructor there ...

Copy link
Member

Choose a reason for hiding this comment

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

Anyway, I can also do this cleanup later on - I need to work on the OpenShiftService this week anyway.

Copy link
Member Author

Choose a reason for hiding this comment

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

@michaelsauter - I would leave this to you .. to do this in one big shot ..

@clemensutschig clemensutschig merged commit 906e03f into opendevstack:master May 11, 2020
@clemensutschig clemensutschig deleted the feature/svc_common_usage branch May 11, 2020 07:32
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.

Merge GitUtil into GitService Move JenkinsService Move NexusService
2 participants