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

Add (jenkins) builder /master & agent information to built image #644

Open
clemensutschig opened this issue May 8, 2021 · 4 comments · Fixed by #658
Open

Add (jenkins) builder /master & agent information to built image #644

clemensutschig opened this issue May 8, 2021 · 4 comments · Fixed by #658
Assignees
Labels
enhancement New feature or request

Comments

@clemensutschig
Copy link
Member

clemensutschig commented May 8, 2021

Is your feature request related to a problem? Please describe.
Today only the Shared lib Version and the raw commit is set as label into the built image (.https://github.com/opendevstack/ods-jenkins-shared-library/blob/master/src/org/ods/component/BuildOpenShiftImageStage.groovy#L150). If one wants to know the exact commit of the build agent image that was uses - one needs to dig based on Image tag in the jenkinsfile etc.

Describe the solution you'd like
Add Image labels for used builder agent - commit etc

@clemensutschig clemensutschig added this to To Do in OpenDevStack 4.0.0 via automation May 8, 2021
@clemensutschig
Copy link
Member Author

oc -n ods get istag jenkins-agent-base:3.0.0 -ojson | jq .image.dockerImageMetadata.Config.Labels

and only take the io.* ones and format into builder-agent.io.* - @michaelsauter thoughts?

@clemensutschig
Copy link
Member Author

ok - better approach - inside the container(s): env | grep OPENSHIFT_BUILD ;)

@clemensutschig
Copy link
Member Author

reopening for 3.x - in case @metmajer you want a backport ...

@clemensutschig
Copy link
Member Author

clemensutschig commented May 28, 2021

from the latest CI BUILD:

amazon-ebs: Step 13/13 : LABEL "io.openshift.build.name"="nginx-iq-test-1" "io.openshift.build.namespace"="unitt-cd" "ods.build.source.repo.url"="http://bitbucket.odsbox.lan:7990/scm/unitt/unitt-nginx-iq-test.git" "ods.build.source.repo.commit.sha"="aa3fff6df1d2a49fd78f997c5d87ec22de53aac5" "ods.build.source.repo.commit.msg"="Initial-OpenDevStack-commit" "ods.build.source.repo.commit.author"="ODS System User (undefined)" "ods.build.source.repo.commit.timestamp"="2021-05-28 03:55:32 +0000" "ods.build.source.repo.branch"="master" "ods.build.jenkins.job.url"="https://jenkins-unitt-cd.ocp.odsbox.lan/job/unitt-cd/job/unitt-cd-run-unitt-nginx-iq-test-unitt-master/1/" "ods.build.timestamp"="Fri May 28 03:56:16 UTC 2021" "ods.build.lib.version"="latest" 
"ext.JENKINS_MASTER_OPENSHIFT_BUILD_COMMIT"="fd086797be77c7750789087b26a54a5ec1f39780"
"ext.JENKINS_MASTER_OPENSHIFT_BUILD_NAME"="jenkins-master-1"
"ext.JENKINS_MASTER_OPENSHIFT_BUILD_SOURCE"="http://bitbucket.odsbox.lan:7990/scm/opendevstack/ods-core.git"
"ext.JENKINS_MASTER_OPENSHIFT_BUILD_NAMESPACE"="ods"
"ext.JENKINS_MASTER_OPENSHIFT_BUILD_REFERENCE"="master"
"ext.JENKINS_AGENT_OPENSHIFT_BUILD_COMMIT"="fd086797be77c7750789087b26a54a5ec1f39780"
"ext.JENKINS_AGENT_OPENSHIFT_BUILD_NAME"="jenkins-agent-base-1"
"ext.JENKINS_AGENT_OPENSHIFT_BUILD_SOURCE"="http://bitbucket.odsbox.lan:7990/scm/opendevstack/ods-core.git"
"ext.JENKINS_AGENT_OPENSHIFT_BUILD_NAMESPACE"="ods"
"ext.JENKINS_AGENT_OPENSHIFT_BUILD_REFERENCE"="master"
�[0m

@metmajer @michaelsauter - works :)

@clemensutschig clemensutschig self-assigned this May 28, 2021
@clemensutschig clemensutschig added the enhancement New feature or request label May 28, 2021
@clemensutschig clemensutschig changed the title Add builder Agent information to built image Add (jenkins) builder /master & agent information to built image May 28, 2021
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
No open projects
1 participant