Add Jenkins X agent to the configuration #13199
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
size/XS
|
/assign @fejta |
| @@ -1226,7 +1226,8 @@ func validateAgent(v JobBase, podNamespace string) error { | |||
| b := string(prowapi.KnativeBuildAgent) | |||
| j := string(prowapi.JenkinsAgent) | |||
| p := string(prowapi.TektonAgent) | |||
| agents := sets.NewString(k, b, j, p) | |||
| x := string(prowapi.JenkinsXAgent) | |||
| agents := sets.NewString(k, b, j, p, x) | |||
There was a problem hiding this comment.
I would expect more validation here -- should not have a podspec, etc ...
There was a problem hiding this comment.
@stevekuznetsov Jenkins X does not require the PodSpec because every project has a build definition which is stored in the project repository. As an example, you can have a look at this pipeline definition: https://github.com/jenkins-x/jx/blob/master/jenkins-x.yml
Jenkins X is mainly using the Refs and ExtraRefs from ProwJobSpec. Given this, I don't think that the config requires extra validation at this point.
There was a problem hiding this comment.
I think his point is that we should validate that if the agent is JenkinsXAgent that it does not define a podspec?
There was a problem hiding this comment.
That's good point! I added some checks to validate that no spec, build_spec or pipeline_rus_spec is defined for jenkins-x agent.
k8s-ci-robot
added
size/M
Signed-off-by: Cosmin Cojocar <cosmin.cojocar@gmx.ch>
… in config for jenkins-x agent Signed-off-by: Cosmin Cojocar <cosmin.cojocar@gmx.ch>
Signed-off-by: Cosmin Cojocar <cosmin.cojocar@gmx.ch>
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: eee87d0f9c202e364e5e2773a1f948cd50ba4f42
|
| TektonAgent = "tekton-pipeline" | ||
| TektonAgent ProwJobAgent = "tekton-pipeline" | ||
| // JenkinsXAgent means prow will schedule the jobs via JenkinsX pipeline. | ||
| JenkinsXAgent ProwJobAgent = "jenkins-x" |
There was a problem hiding this comment.
So how does this actually end up working? Some proprietary controller that looks at ProwJobs in the cluster?
There was a problem hiding this comment.
That's more or less the size of it, but it won't be proprietary! :) Basically we'll be using a freestanding version (i.e. outside the prow tree, in its own repo) of the pipeline controller that Cosmin built at prow/cmd/pipeline, which will allow us to encapsulate the customizations we need without interfering with what you folks are doing upstream.
k8s-ci-robot
added
the
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ccojocar, fejta, matthyx The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
Thinking this over another time instead of asking y'all to check in every type of agent you come up with, why don't we do this:
I don't really think that every time JenkinsX or OpenShift or whoever invents a new type of controller to integrate with ProwJobs we should expects devs to jump in and update a list of magic strings, that seems annoying at best. If we just tolerate unrelated agents we can allow development for those to happen entirely out of band, right? |
|
This is not required anymore. I am going to close it. Thanks @wbrefvem for contributing a more generic solution. |
I am adding the Jenkins X agent to the configuration as agreed in #11888 and in the design document review. This will allow us to use our custom pipeline controller to trigger Jenkins X pipeline execution. This controller is planned to be maintained by Jenkins X team in a stand-alone repository.
cc @fejta @cjwagner @wbrefvem @abayer