From 3c09a7579a4781f15d1db31aa03d0ce75aa90b4a Mon Sep 17 00:00:00 2001 From: Jacobus Geluk Date: Thu, 5 Oct 2017 12:49:12 +0100 Subject: [PATCH] INFRA-194 Disabling direct execution of nomagic glossary in Jenkinsfile context for now, we just take archived artifacts from old job master --- etc/process/Jenkinsfile | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/etc/process/Jenkinsfile b/etc/process/Jenkinsfile index 16ddce139..f10c72e08 100644 --- a/etc/process/Jenkinsfile +++ b/etc/process/Jenkinsfile @@ -28,6 +28,9 @@ family_root = "${spec_root}/${family}" spec_root_url="https://spec.edmcouncil.org" stage('Prepare') { + + //setGitHubPullRequestStatus context: 'fibo-publish', message: '', state: 'PENDING' + // // Run the prepare stage on the stardog node, check out all the repos there // @@ -195,8 +198,17 @@ stage('Build') { "nomagic" : { node('nomagic') { + unstash 'git-vars' + + def GIT_BRANCH = readFile 'git_branch.env' + def GIT_TAG_NAME = readFile 'git_tag_name.env' + def GIT_AUTHOR = readFile 'git_author.env' + def GIT_COMMIT = readFile 'git_commit.env' + unstash 'infra-jenkins' + /* JG>Disabling this now until nomagic process actually gets its input from this job + withCredentials([ usernamePassword( credentialsId: '50cac519-d41c-4765-8563-c43b7f55c877', @@ -225,6 +237,27 @@ stage('Build') { sh "./jenkins/bin/publish-fibo.sh" } } + */ + // + // Instead, we're just dumping the artifacts produced by the following job here and + // process it further just as if it has been generated here: + // https://jenkins.edmcouncil.org/job/NoMagic/job/fibo-publish-nomagic/ + // + step([ + $class: 'CopyArtifact', + excludes: '*.jar, *.csv', + filter: '**', + projectName: 'NoMagic/fibo-publish-nomagic', + target: "target/fibo/glossary/${GIT_BRANCH}/${GIT_TAG_NAME}" + ]) + step([ + $class: 'CopyArtifact', + excludes: '*.jar, *.html, *.css, *.js', + filter: '*.csv', + projectName: 'NoMagic/fibo-publish-nomagic', + target: "target/fibo/datadictionary/${GIT_BRANCH}/${GIT_TAG_NAME}" + ]) + // // Archive the artifacts generated by the publish-fibo.sh script // @@ -252,13 +285,17 @@ stage('Publish') { unstash 'publish-script-output-stardog-node' sh 'ls -al' + /* JG>Disabling this now until nomagic process actually gets its input from this job echo 'Unstashing the output of the publish-script as it ran on the nomagic node' unstash 'publish-script-output-nomagic-node' sh 'ls -al' + */ echo "Copy all generated content to /mnt/jenkins-disk/spec.edmcouncil.org:" sh 'ls -al /mnt/jenkins-disk/spec.edmcouncil.org/' sh 'cp -vr . /mnt/jenkins-disk/spec.edmcouncil.org/' + + //setGitHubPullRequestStatus context: 'fibo-publish', message: '', state: 'SUCCESS' } }