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 f48a315 update to submodule HEAD
f48a315 is described below
commit f48a3152322867716512ed6a9c1002caca284e57
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Jan 10 15:55:01 2022 +0100
update to submodule HEAD
---
Jenkinsfile | 87 +++++++++++++++++-------------------------------------------
cache | 2 +-
crypto | 2 +-
factory | 2 +-
intake | 2 +-
json | 2 +-
localization | 2 +-
parser | 2 +-
pool | 2 +-
quartz | 2 +-
security | 2 +-
site | 2 +-
upload | 2 +-
yaafi | 2 +-
yaafi-crypto | 2 +-
15 files changed, 38 insertions(+), 77 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6f8b978..762226a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,58 +1,16 @@
-#!groovy
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// https://ci-builds.apache.org/pipeline-syntax/globals
-// https://www.jenkins.io/doc/pipeline/steps/workflow-basic-steps/
-// https://www.jenkins.io/doc/pipeline/examples/#maven-and-jdk-specific-version
-// https://cwiki.apache.org/confluence/display/INFRA/Jenkins+node+labels
-//
https://cwiki.apache.org/confluence/display/INFRA/ASF+Cloudbees+Operations+Center
-
-// started with jena-site and gora
-
-// 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"
-//
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
-
-// Fulcurm-Build has submodules, which are expcetd for this Jenkinsfile NOT to
be fetched if cloning!
-// This is the default (do NOT provide git clone --recurse-submodules flag)
and this is because
-// only the current submodule is initialized downstrema with git submodule
update --init
-
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-
def JDK_NAME = env.JDK_NAME ?: 'jdk_1.8_latest'
def MVN_NAME = env.MVN_NAME ?: 'maven_3_latest'
pipeline
{
agent
- {
- node {
- label AGENT_LABEL
- }
+ {
+ label AGENT_LABEL
}
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')
@@ -68,7 +26,7 @@ pipeline
environment
{
DEPLOY_BRANCH = 'asf-site'
- STAGING_DIR = "target/${params.MULTI_MODULE}/"
+ STAGING_DIR = "target/${params.MULTI_MODULE}"
// LANG = 'C.UTF-8'
// -B, --batch-mode Run in non-interactive (batch) mode
// -e, --error Produce execution error messages
@@ -86,6 +44,7 @@ pipeline
{
steps
{
+ git
'https://gitbox.apache.org/repos/asf/turbine-fulcrum-build.git'
// not --update as clone ise done without
--recurse-submodules
sh "git submodule update --init
${params.FULCRUM_COMPONENT}"
// branch will be detached head, need to checkout
explicitely
@@ -119,6 +78,7 @@ pipeline
sh "pwd"
// builds into target/site folder, this
folder is expected to be preserved as it is used in next step
sh "mvn $MAVEN_CLI_OPTS $MAVEN_GOALS"
+ stash includes: "${STAGING_DIR}/**/*",
name: "${params.FULCRUM_COMPONENT}-site"
}
}
}
@@ -138,6 +98,7 @@ pipeline
sh "pwd"
// builds into target/staging folder, this
folder is expected to be preserved as it is used in next step
sh "mvn $MAVEN_CLI_OPTS $MAVEN_GOALS"
+ stash includes: "${STAGING_DIR}/**/*",
name: "${params.FULCRUM_COMPONENT}-site"
}
}
}
@@ -145,13 +106,6 @@ pipeline
{
when
{
- allOf {
- not {
- expression
- {
- params.TEST_MODE
- }
- }
anyOf
{
expression
@@ -159,9 +113,7 @@ pipeline
env.CURRENT_BRANCH ==~
/(?i)^(master|trunk|main).*?/
}
}
- }
}
- // Only the nodes labeled 'git-websites' have the
credentials to commit to the.
agent {
node {
label 'git-websites'
@@ -169,16 +121,18 @@ pipeline
}
steps
{
- echo 'Deploying ${params.FULCRUM_COMPONENT} Site'
+ sh "git submodule update --init
${params.FULCRUM_COMPONENT}"
dir("${params.FULCRUM_COMPONENT}")
{
script
{
sh "pwd"
+ echo "Deploying
${params.FULCRUM_COMPONENT} Site"
+ unstash
"${params.FULCRUM_COMPONENT}-site"
// Checkout branch with current
site content, target folder should be ignored!
sh "git checkout ${DEPLOY_BRANCH}"
// fetch only shallow
- sh "git pull --depth=2 origin
${DEPLOY_BRANCH}"
+ // sh "git pull --depth=2 origin
${DEPLOY_BRANCH}"
def exists = fileExists
'.gitignore'
if (exists)
@@ -194,14 +148,21 @@ pipeline
sh """
git ls-files | grep -v "^\\." | xargs rm -f
"""
- sh "cp -rf ./${STAGING_DIR}* ."
+ sh "cp -rf ./${STAGING_DIR}/* ."
// Commit the changes to the
target branch BRANCH_NAME, groovy allows to omit env. prefix, available in
multibranch pipeline.
env.COMMIT_MESSAGE =
"${params.FULCRUM_COMPONENT}: Updated site in ${DEPLOY_BRANCH} from
${env.CURRENT_BRANCH} (${env.LAST_SHA}) from ${params.MULTI_MODULE} from
${BUILD_URL}"
- sh "git add -A"
- sh "git commit -m
"${env.COMMIT_MESSAGE}" | true"
- echo "${env.COMMIT_MESSAGE}"
- // Push the generated content for
deployment
- sh "git push -u origin
${DEPLOY_BRANCH}"
+ echo "${env.COMMIT_MESSAGE}
....break...."
+
+ if ( params.TEST_MODE == false) {
+ echo 'committing as test mode
false'
+ //sh "git add -A"
+ //sh "git commit -m
"${env.COMMIT_MESSAGE}" | true"
+ // Push the generated content
for deployment
+ //sh "git push -u origin
${DEPLOY_BRANCH}"
+ } else {
+ echo 'Skipping as test mode'
+ }
+
}
}
}
diff --git a/cache b/cache
index d07979f..b5fc03c 160000
--- a/cache
+++ b/cache
@@ -1 +1 @@
-Subproject commit d07979fad5060863a657cf8567686186b207b10d
+Subproject commit b5fc03c1261032cd4201e067fe8837e18d43a704
diff --git a/crypto b/crypto
index 7c79b4a..9fbdd91 160000
--- a/crypto
+++ b/crypto
@@ -1 +1 @@
-Subproject commit 7c79b4af9c7219abe2e9551c20eb0b2aac2e1ca0
+Subproject commit 9fbdd910bf080f9565b243f1fac4d50f07ee4b7c
diff --git a/factory b/factory
index 561e52d..1124523 160000
--- a/factory
+++ b/factory
@@ -1 +1 @@
-Subproject commit 561e52d52f62c718607877fb056de4f220bff6ab
+Subproject commit 1124523e1f8c37695cdf38ed766914e8fe97cac6
diff --git a/intake b/intake
index b823906..f98e9c7 160000
--- a/intake
+++ b/intake
@@ -1 +1 @@
-Subproject commit b8239065d339de78534ce53831cc31f5964c3b47
+Subproject commit f98e9c755bb4fae51caa278d8593d1f6b5e31804
diff --git a/json b/json
index 062efea..b6383aa 160000
--- a/json
+++ b/json
@@ -1 +1 @@
-Subproject commit 062efea53d03f9d2d65207cdf0657902ff4b1934
+Subproject commit b6383aa9bb224041d48125c31e0fe3f350f352fc
diff --git a/localization b/localization
index 57a4c9d..d15901a 160000
--- a/localization
+++ b/localization
@@ -1 +1 @@
-Subproject commit 57a4c9d9d1268cb9e1d2d83192accad7f7c9fad8
+Subproject commit d15901ac21e291e3e27336b09f9d077be6c2e8b7
diff --git a/parser b/parser
index bfcda58..e2f70be 160000
--- a/parser
+++ b/parser
@@ -1 +1 @@
-Subproject commit bfcda582028d6654ee2eeaf1ad98f5df9518ed00
+Subproject commit e2f70bee54ee951a0175432eb9dbd4f496a1d10e
diff --git a/pool b/pool
index 4115269..afb7415 160000
--- a/pool
+++ b/pool
@@ -1 +1 @@
-Subproject commit 411526929494cc62cb8115d948d61d48cdc774bd
+Subproject commit afb74159e23caa8db0d9fd9adff306b5014b9e22
diff --git a/quartz b/quartz
index e56e8aa..45a7cf0 160000
--- a/quartz
+++ b/quartz
@@ -1 +1 @@
-Subproject commit e56e8aa6780820f6747849f19cce114fc93a82d7
+Subproject commit 45a7cf07c3d7064c7c4c41197192f9246829b556
diff --git a/security b/security
index f51f6dd..ac886f8 160000
--- a/security
+++ b/security
@@ -1 +1 @@
-Subproject commit f51f6dde7387d4f480671cbbab670b8978143a13
+Subproject commit ac886f890db858518ad2cddced1ebc3244d1a1fe
diff --git a/site b/site
index a3d1d02..3cfaea4 160000
--- a/site
+++ b/site
@@ -1 +1 @@
-Subproject commit a3d1d02ec32f533d761d8c2c802d922030ebef0b
+Subproject commit 3cfaea4190eeb7bd70aeea17e4bb3697093f7198
diff --git a/upload b/upload
index fc3e6bf..37be7c5 160000
--- a/upload
+++ b/upload
@@ -1 +1 @@
-Subproject commit fc3e6bf6d100616b2ac410dee57583fd060b578a
+Subproject commit 37be7c50e11b03b1a89a54c72dcc06bcb55e7633
diff --git a/yaafi b/yaafi
index 213487d..e63808d 160000
--- a/yaafi
+++ b/yaafi
@@ -1 +1 @@
-Subproject commit 213487de0ff0d16bde0f61a107cb5f0443b97d7e
+Subproject commit e63808dc8ca2540618e589c1cdeff8d58c6d24d6
diff --git a/yaafi-crypto b/yaafi-crypto
index 3065841..606da68 160000
--- a/yaafi-crypto
+++ b/yaafi-crypto
@@ -1 +1 @@
-Subproject commit 306584142df082ffec78bdc99eac90ab1820409e
+Subproject commit 606da6879acba6142b2cfc27c7bce783e18e89fa
