You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/01/07 20:51:58 UTC

[camel-website] branch pnp updated (adf70a8 -> bd1a114)

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

zregvart pushed a change to branch pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git.


 discard adf70a8  CAMEL-11500: cleanup the build
     new bd1a114  CAMEL-11500: cleanup the build

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (adf70a8)
            \
             N -- N -- N   refs/heads/pnp (bd1a114)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


[camel-website] 01/01: CAMEL-11500: cleanup the build

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git

commit bd1a114f89d41ab564b4456cf70e570599745590
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Jan 7 21:50:21 2019 +0100

    CAMEL-11500: cleanup the build
    
    Adds timestamps, color, unifies the docker build configuration.
---
 Jenkinsfile | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8aedd1c..37a16f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,11 @@ def NODE = 'git-websites'
 
 pipeline {
     agent {
-        label "$NODE"
+        dockerfile {
+            dir 'camel-website'
+            label "$NODE"
+            reuseNode true
+        }
     }
 
     options {
@@ -28,6 +32,10 @@ pipeline {
             logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
         )
 
+        timestamps()
+
+        ansiColor('xterm')
+
         checkoutToSubdirectory('camel-website')
     }
 
@@ -40,34 +48,24 @@ pipeline {
 
     stages {
         stage('Theme') {
-            agent {
-                dockerfile {
-                    dir 'camel-website'
-                    label "$NODE"
-                    reuseNode true
-                }
-            }
-
             steps {
                 sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive --frozen-lockfile"
             }
         }
 
         stage('Website') {
-            agent {
-                dockerfile {
-                    dir 'camel-website'
-                    label "$NODE"
-                    reuseNode true
-                }
-            }
-
             steps {
                 sh "cd $WORKSPACE/camel-website && yarn --non-interactive --frozen-lockfile"
             }
         }
 
         stage('Deploy') {
+            agent {
+                node {
+                    label "$NODE"
+                }
+            }
+
             when {
                 branch 'master'
             }