Merge branch 'INFRA-225'

edmcouncil · Jan 2, 2018 · 0959498 · 0959498
2 parents 8fd6343 + b595238
commit 0959498
Showing 1 changed file with 69 additions and 14 deletions.
diff --git a/etc/process/Jenkinsfile b/etc/process/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
   agent none
 
   environment {
-    FIBO_INFRA_BRANCH = 'INFRA-225'
+    FIBO_INFRA_BRANCH = 'master'
     LC_ALL = 'en_US.UTF-8'
     LANG = 'en_US.UTF-8'
     LANGUAGE = 'en_US.UTF-8'
@@ -117,28 +117,83 @@ pipeline {
       }
     } // end of stage 'Prepare'
 
-    stage('Build') {
+    stage('Build Product Ontology') {
       agent {
         label 'stardog'
       }
-      tools {
-        //
-        // This installs the NodeJS tools as they are configured in the "Global Tool Configuration"
-        // of Jenkins: https://jenkins.edmcouncil.org/configureTools/
-        //
-        nodejs 'NodeJS'
-      }
 
       steps {
         //
         // Execute the publish script
         //
-        // TODO: Split this script up in separate "stages" in this repository
+        sh "./fibo-infra/jenkins/bin/publish-fibo.sh ontology"
         //
-        dir('fibo-infra') {
-          echo "Execute the publish-fibo.sh script:"
-          sh "./jenkins/bin/publish-fibo.sh"
+        // Now stash all files in the env directory for reuse in the other worker nodes
+        // used by the next products
+        //
+        stash includes: '**', name: 'all-ontology-data'
+      }
+    } // end of stage 'Build Product Ontology'
+
+    stage('Build Other Products') {
+      parallel {
+        stage("Build Widoco") {
+          agent {
+            label 'stardog'
+          }
+          steps {
+            unstash 'all-ontology-data'
+            sh "./fibo-infra/jenkins/bin/publish-fibo.sh widoco"
+          }
+        }
+        stage("Build Glossary") {
+          agent {
+            label 'stardog'
+          }
+          tools {
+            //
+            // This installs the NodeJS tools as they are configured in the "Global Tool Configuration"
+            // of Jenkins: https://jenkins.edmcouncil.org/configureTools/
+            //
+            nodejs 'NodeJS'
+          }
+          steps {
+            unstash 'all-ontology-data'
+            sh "./fibo-infra/jenkins/bin/publish-fibo.sh glossary"
+          }
+        }
+        stage("Build Vocabulary") {
+          agent {
+            label 'stardog'
+          }
+          steps {
+            unstash 'all-ontology-data'
+            sh "./fibo-infra/jenkins/bin/publish-fibo.sh vocabulary"
+          }
+        }
+        stage("Build Datadictionary") {
+          agent {
+            label 'stardog'
+          }
+          steps {
+            unstash 'all-ontology-data'
+            sh "./fibo-infra/jenkins/bin/publish-fibo.sh datadictionary"
+          }
         }
+      }
+    } // end of stage 'Build Other Products'
+
+    stage('Build Final Content') {
+      agent {
+        label 'stardog'
+      }
+
+      steps {
+        //
+        // Now after all the above is done, make sure we run the final
+        // publish step which zips it all up into the target directory
+        //
+        sh "./fibo-infra/jenkins/bin/publish-fibo.sh publish"
 
         //
         // Archive the artifacts generated by the publish-fibo.sh script
@@ -152,7 +207,7 @@ pipeline {
           ])
         }
       }
-    } // end of stage 'Build'
+    } // end of stage 'Build Final Content'
 
     //
     // Run the publish on the master jenkins agent by just copying all the generated artifacts right into the workspace