You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2020/11/18 12:06:32 UTC

[incubator-hop-docs] 15/49: switch to asf-site branch and website node

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

mcasters pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-hop-docs.git

commit be4ddcecf81de5aa25d30db5462847fd7f838232
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Nov 8 16:39:19 2020 +0100

    switch to asf-site branch and website node
---
 Jenkinsfile | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b36939e..01c84ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def githubToken = "399061d0-5ab5-4142-a186-a52081fef742"
+def AGENT_LABEL = env.AGENT_LABEL ?: 'git-websites'
 
 pipeline {
 
@@ -42,8 +41,8 @@ pipeline {
          }
         stage('checkout Hop Code') {
             when {
-                branch 'master'
-                not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
+                branch 'asf-site'
+                //not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
             }
             steps {
                 dir('hop') {
@@ -54,8 +53,8 @@ pipeline {
         }
         stage('Copy project docs') {
             when {
-                branch 'master'
-                not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
+                branch 'asf-site'
+                //not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
             }
             steps {
                     sh 'mkdir ./tmp'
@@ -64,11 +63,10 @@ pipeline {
         }
         stage('Process Docs') {
             when {
-                branch 'master'
-                not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
+                branch 'asf-site'
+                //not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
             }
             steps {
-                withCredentials([usernamePassword(credentialsId: githubToken, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
                 echo 'Adding new Files from Hop'
                 sh '''
                     cd ./tmp;
@@ -87,17 +85,15 @@ pipeline {
                 '''
                 echo 'Generate new Navigation'
                 sh './generate_navigation.sh'
-                sh 'git config --local credential.helper "!f() { echo username=\\$GIT_USERNAME; echo password=\\$GIT_PASSWORD; }; f";'
                 sh 'git add .'
                 sh 'git commit -m "Documentation updated to $GIT_COMMIT"'
-                sh 'git push --force origin HEAD:master'
+                sh 'git push --force origin asf-site'
                 }
-            }
         }
         stage('Website update') {
             when {
-                branch 'master'
-                not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
+                branch 'asf-site'
+                //not { triggeredBy cause: "UserIdCause", detail: "asf-ci" }
             }
             steps {
                 build job: 'Hop/Hop-website/master', wait: false