INFRA-194 Fixed nomagic publication

edmcouncil · Oct 9, 2017 · bb17634 · bb17634
1 parent 0827c0a
commit bb17634
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/etc/process/Jenkinsfile b/etc/process/Jenkinsfile
@@ -260,18 +260,30 @@ pipeline {
             //
             step([
               $class:       'CopyArtifact',
-              excludes:     '*.jar, *.csv',
+              excludes:     '**/*.jar, **/*.csv, **/PRODIN.html, **/DEVIN.html',
               filter:       '**',
               projectName:  'NoMagic/fibo-publish-nomagic',
               target:       "target/fibo/glossary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}"
             ])
+            echo "Copied nomagic output to target/fibo/glossary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}:"
+            dir("target/fibo/glossary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}") {
+              sh "mv -v PRODUCTION.html  production.html || true"
+              sh "mv -v DEVELOPMENT.html development.html || true"
+            }
+            sh "find target/fibo/glossary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}"
             step([
               $class:       'CopyArtifact',
               excludes:     '*.jar, *.html, *.css, *.js',
               filter:       '*.csv',
               projectName:  'NoMagic/fibo-publish-nomagic',
               target:       "target/fibo/datadictionary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}"
             ])
+            echo "Copied nomagic output to target/fibo/datadictionary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}:"
+            dir("target/fibo/datadictionary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}") {
+              sh "mv -v datadictionaryPROD.csv production.csv || true"
+              sh "mv -v datadictionaryDEV.csv development.csv || true"
+            }
+            sh "find target/fibo/datadictionary/${env.GIT_BRANCH}/${env.GIT_TAG_NAME}"
 
             //
             // Archive the artifacts generated by the publish-fibo.sh script
@@ -313,11 +325,9 @@ pipeline {
         sh 'find . -name \'.git\' -exec rm -rf {} \\; || true'
         sh 'find . -name \'.gitignore\' -exec rm -f {} \\; || true'
 
-        /* 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 ${env.NGINX_SPEC_ROOT}:"
         sh 'ls -al ${NGINX_SPEC_ROOT}/'