You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/12/15 14:36:19 UTC

[turbine-fulcrum-build] branch master updated: fix Jenkinsfile, update README

This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-build.git


The following commit(s) were added to refs/heads/master by this push:
     new 4247bfa  fix Jenkinsfile, update README
4247bfa is described below

commit 4247bfa36184ded3ceff95108d5611bddad8eb7c
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Wed Dec 15 15:33:38 2021 +0100

    fix Jenkinsfile, update README
---
 .gitignore    |  2 ++
 Jenkinsfile   | 16 ++++++++++++----
 cache         |  2 +-
 crypto        |  2 +-
 factory       |  2 +-
 intake        |  2 +-
 json          |  2 +-
 localization  |  2 +-
 parser        |  2 +-
 pool          |  2 +-
 quartz        |  2 +-
 security      |  2 +-
 site          |  2 +-
 testcontainer |  2 +-
 upload        |  2 +-
 yaafi         |  2 +-
 yaafi-crypto  |  2 +-
 17 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8135ba5..bb8bcc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 target/
+.idea/
+.settings/
 *.log
 .classpath
 .project
diff --git a/Jenkinsfile b/Jenkinsfile
index a6c47c0..6f8b978 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,9 @@
 // git-websites:
 // "Nodes that are reserved for ANY project that wants to build their website docs and
 // publish directly live (requires asf-site and pypubsub"
-// no git-websites label her using ubuntu
+// https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes:
+// only Jenkins nodes tagged with "git-websites" are able to push to an ASF Git repositories "asf-site" branch 
+//
 
 // Jenkins build server used: https://builds.apache.org/ / ci-builds.apache.org
 
@@ -51,7 +53,6 @@ pipeline
             }
         parameters
             {
-                //string(name: 'MULTI_MODULE', defaultValue: 'staging', description: '')
                 choice(name: 'MULTI_MODULE', choices: ['staging', 'site'], description: 'Run as multi or single module ')
                 // no default
                 choice(name: 'FULCRUM_COMPONENT', choices: ['','cache', 'crypto', 'factory', 'intake', 'json', 'localization', 'parser', 'pool', 'quartz', 'security', 'site', 'testcontainer', 'upload', 'yaafi', 'yaafi-crypto'], description: 'Select fulcrum component')
@@ -121,7 +122,7 @@ pipeline
                                 }
                         }
                 }
-            stage('Build2')
+            stage('BuildWithStage')
                 {
                     when
                         {
@@ -140,7 +141,7 @@ pipeline
                                 }
                         }
                 }
-            stage('Deploy')
+            stage('Deploy Site')
                 {
                     when
                         {
@@ -160,8 +161,15 @@ pipeline
                             }
                         }
                     }
+                    // Only the nodes labeled 'git-websites' have the credentials to commit to the.
+                    agent {
+                        node {
+                            label 'git-websites'
+                        }
+                    }
                     steps
                         {
+                            echo 'Deploying ${params.FULCRUM_COMPONENT} Site'
                             dir("${params.FULCRUM_COMPONENT}")
                                 {
                                     script
diff --git a/cache b/cache
index c4d893f..d07979f 160000
--- a/cache
+++ b/cache
@@ -1 +1 @@
-Subproject commit c4d893f847edebd4aa3a7b36ddaf92d3d4cef6f9
+Subproject commit d07979fad5060863a657cf8567686186b207b10d
diff --git a/crypto b/crypto
index 6dd5d7a..7c79b4a 160000
--- a/crypto
+++ b/crypto
@@ -1 +1 @@
-Subproject commit 6dd5d7adb3f700884dc20d026280879743d9e356
+Subproject commit 7c79b4af9c7219abe2e9551c20eb0b2aac2e1ca0
diff --git a/factory b/factory
index de52ead..561e52d 160000
--- a/factory
+++ b/factory
@@ -1 +1 @@
-Subproject commit de52ead0f3d06a360e47395e4d61c7d5ff771471
+Subproject commit 561e52d52f62c718607877fb056de4f220bff6ab
diff --git a/intake b/intake
index 4fa60ae..b823906 160000
--- a/intake
+++ b/intake
@@ -1 +1 @@
-Subproject commit 4fa60aead41a057017ae3d9731651fa689537170
+Subproject commit b8239065d339de78534ce53831cc31f5964c3b47
diff --git a/json b/json
index 782d6d6..062efea 160000
--- a/json
+++ b/json
@@ -1 +1 @@
-Subproject commit 782d6d67e6182481b744127e049dee552e9365dd
+Subproject commit 062efea53d03f9d2d65207cdf0657902ff4b1934
diff --git a/localization b/localization
index b4dd60d..57a4c9d 160000
--- a/localization
+++ b/localization
@@ -1 +1 @@
-Subproject commit b4dd60df57365aeffcbf851a4012b3f946fa15cd
+Subproject commit 57a4c9d9d1268cb9e1d2d83192accad7f7c9fad8
diff --git a/parser b/parser
index cfe430d..bfcda58 160000
--- a/parser
+++ b/parser
@@ -1 +1 @@
-Subproject commit cfe430d1b2444f9c33635382ea3a5bc5fc98ad6b
+Subproject commit bfcda582028d6654ee2eeaf1ad98f5df9518ed00
diff --git a/pool b/pool
index 633cf73..4115269 160000
--- a/pool
+++ b/pool
@@ -1 +1 @@
-Subproject commit 633cf734689326ee826de9b713c2e0195550b07a
+Subproject commit 411526929494cc62cb8115d948d61d48cdc774bd
diff --git a/quartz b/quartz
index 69698fb..e56e8aa 160000
--- a/quartz
+++ b/quartz
@@ -1 +1 @@
-Subproject commit 69698fbb5b4cbc200713b64f727cfe98614edbc4
+Subproject commit e56e8aa6780820f6747849f19cce114fc93a82d7
diff --git a/security b/security
index cacbef7..f51f6dd 160000
--- a/security
+++ b/security
@@ -1 +1 @@
-Subproject commit cacbef75a874c4ab489ed76489a1235b885b5f97
+Subproject commit f51f6dde7387d4f480671cbbab670b8978143a13
diff --git a/site b/site
index 07282ff..a3d1d02 160000
--- a/site
+++ b/site
@@ -1 +1 @@
-Subproject commit 07282ff6d4607a6ee8514296e07793e10077fbc7
+Subproject commit a3d1d02ec32f533d761d8c2c802d922030ebef0b
diff --git a/testcontainer b/testcontainer
index ae30d6a..ec542dc 160000
--- a/testcontainer
+++ b/testcontainer
@@ -1 +1 @@
-Subproject commit ae30d6ae26c60338ad700e21ce4ec1b4f13cc553
+Subproject commit ec542dce73ec09608807f4d3f0b2f1956bba7471
diff --git a/upload b/upload
index 12184b5..fc3e6bf 160000
--- a/upload
+++ b/upload
@@ -1 +1 @@
-Subproject commit 12184b542dffa966eb0b4e3b05d880167b9e74f1
+Subproject commit fc3e6bf6d100616b2ac410dee57583fd060b578a
diff --git a/yaafi b/yaafi
index fce5815..213487d 160000
--- a/yaafi
+++ b/yaafi
@@ -1 +1 @@
-Subproject commit fce58150f86264dee7810798a2ed8888785c974e
+Subproject commit 213487de0ff0d16bde0f61a107cb5f0443b97d7e
diff --git a/yaafi-crypto b/yaafi-crypto
index 2c838b4..3065841 160000
--- a/yaafi-crypto
+++ b/yaafi-crypto
@@ -1 +1 @@
-Subproject commit 2c838b42a56f6ac9e1e11a9abd28537d29fd9e86
+Subproject commit 306584142df082ffec78bdc99eac90ab1820409e