Skip to content

wrap execution of components, and execute on master node (master) #572

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.

Sign up for GitHub

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

Open
clemensutschig wants to merge 3 commits into
base: master
Choose a base branch
from
Open

wrap execution of components, and execute on master node (master) #572

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b074222
different approach - executeOdsComponentOnly
clemensutschig Feb 1, 2021
29c3b5d
same for script / make
clemensutschig Feb 1, 2021
b0e78ca
codenarc2
clemensutschig Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 45 additions & 33 deletions src/org/ods/orchestration/util/MROPipelineUtil.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,32 +86,41 @@ class MROPipelineUtil extends PipelineUtil {
}

private void executeODSComponent(Map repo, String baseDir) {
this.steps.dir(baseDir) {
if (repo.data.openshift.resurrectedBuild) {
logger.info("Repository '${repo.id}' is in sync with OpenShift, no need to rebuild")
return
}
// force this to happen on master - if an agent is needed, the closure has to
// take care about it. The reason for this is the closure to have access to files
// from the component, e.g. jenkinsfile, shell scripts,...
this.steps.node {
// when a node switch happens, jenkins creates a new dir workspace@xxx
// so we need to copy.
def currentNodeBaseDir = "${this.steps.env.WORKSPACE}/${REPOS_BASE_DIR}/${repo.id}"
this.steps.sh "cp -rf ${baseDir} ${currentNodeBaseDir} | true"
this.steps.dir(currentNodeBaseDir) {
if (repo.data.openshift.resurrectedBuild) {
logger.info("Repository '${repo.id}' is in sync with OpenShift, no need to rebuild")
return
}

def job
List<String> mainEnv = this.project.getMainReleaseManagerEnv()
mainEnv << "NOTIFY_BB_BUILD=${!project.isWorkInProgress}"
this.steps.withEnv (mainEnv) {
job = this.loadGroovySourceFile("${baseDir}/Jenkinsfile")
}
// Collect ODS build artifacts for repo.
// We get a map with at least two keys ("build" and "deployments").
def buildArtifacts = job.getBuildArtifactURIs()
buildArtifacts.each { k, v ->
if (k != 'failedStage') {
repo.data.openshift[k] = v
def job
List<String> mainEnv = this.project.getMainReleaseManagerEnv()
mainEnv << "NOTIFY_BB_BUILD=${!project.isWorkInProgress}"
this.steps.withEnv (mainEnv) {
job = this.loadGroovySourceFile("${currentNodeBaseDir}/Jenkinsfile")
}
}
def versionAndBuild = "${this.project.buildParams.version}/${this.steps.env.BUILD_NUMBER}"
repo.data.openshift[DeploymentDescriptor.CREATED_BY_BUILD_STR] = versionAndBuild
this.logger.debug("Collected ODS build artifacts for repo '${repo.id}': ${repo.data.openshift}")
// Collect ODS build artifacts for repo.
// We get a map with at least two keys ("build" and "deployments").
def buildArtifacts = job.getBuildArtifactURIs()
buildArtifacts.each { k, v ->
if (k != 'failedStage') {
repo.data.openshift[k] = v
}
}
def versionAndBuild = "${this.project.buildParams.version}/${this.steps.env.BUILD_NUMBER}"
repo.data.openshift[DeploymentDescriptor.CREATED_BY_BUILD_STR] = versionAndBuild
this.logger.debug("Collected ODS build artifacts for repo '${repo.id}': ${repo.data.openshift}")

if (buildArtifacts.failedStage) {
throw new RuntimeException("Error: aborting due to previous errors in repo '${repo.id}'.")
if (buildArtifacts.failedStage) {
throw new RuntimeException("Error: aborting due to previous errors in repo '${repo.id}'.")
}
}
}
}
Expand Down Expand Up @@ -344,16 +353,19 @@ class MROPipelineUtil extends PipelineUtil {
def phaseConfig = repo.pipelineConfig.phases ? repo.pipelineConfig.phases[name] : null
if (phaseConfig) {
def label = "${repo.id} (${repo.url})"

if (phaseConfig.type == PipelineConfig.PHASE_EXECUTOR_TYPE_MAKEFILE) {
this.steps.dir(baseDir) {
def steps = "make ${phaseConfig.target}"
this.steps.sh script: steps, label: label
}
} else if (phaseConfig.type == PipelineConfig.PHASE_EXECUTOR_TYPE_SHELLSCRIPT) {
this.steps.dir(baseDir) {
def steps = "./scripts/${phaseConfig.steps}"
this.steps.sh script: steps, label: label
this.steps.node {
// when a node switch happens, jenkins creates a new dir workspace@xxx
// so we need to copy.
def currentNodeBaseDir = "${this.steps.env.WORKSPACE}/${REPOS_BASE_DIR}/${repo.id}"
this.steps.sh "cp -rf ${baseDir} ${currentNodeBaseDir} | true"
this.steps.dir(currentNodeBaseDir) {
if (phaseConfig.type == PipelineConfig.PHASE_EXECUTOR_TYPE_MAKEFILE) {
def steps = "make ${phaseConfig.target}"
this.steps.sh script: steps, label: label
} else if (phaseConfig.type == PipelineConfig.PHASE_EXECUTOR_TYPE_SHELLSCRIPT) {
def steps = "./scripts/${phaseConfig.steps}"
this.steps.sh script: steps, label: label
}
}
}
} else {
Expand Down