(couchdb) 01/01: Improve CI performance by combining some stages

[vatamane]

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

vatamane pushed a commit to branch combine-some-ci-stages
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 21a016de94feaf96d14bf3d5fb2b3cdcaa5672e9
Author: Nick Vatamaniuc <vatam...@apache.org>
AuthorDate: Sat Mar 21 17:57:11 2026 -0400

    Improve CI performance by combining some stages
    
    Check source and docs when building source and docs instead of a
    separate stage. This way we avoid starting another docker job on a
    different node possibly and reduce some churn.
---
 build-aux/Jenkinsfile | 71 +++++----------------------------------------------
 1 file changed, 6 insertions(+), 65 deletions(-)

diff --git a/build-aux/Jenkinsfile b/build-aux/Jenkinsfile
index 7e21db44b..c22415411 100644
--- a/build-aux/Jenkinsfile
+++ b/build-aux/Jenkinsfile
@@ -609,37 +609,6 @@ pipeline {
       }
     } // stage 'Setup Environment'
 
-    stage('Docs Check') {
-      // Run docs `make check` stage if any docs changed
-      when {
-        beforeOptions true
-        expression { DOCS_CHANGED == '1' }
-      }
-      agent {
-        docker {
-          image "${DOCKER_IMAGE_BASE}-${MINIMUM_ERLANG_VERSION}"
-          label 'docker'
-          args "${DOCKER_ARGS}"
-          registryUrl 'https://docker.io/'
-          registryCredentialsId 'dockerhub_creds'
-        }
-      }
-      steps {
-        sh '''
-          make python-black
-        '''
-        sh '''
-          (cd src/docs && make check)
-        '''
-      }
-      post {
-        cleanup {
-          // UGH see https://issues.jenkins-ci.org/browse/JENKINS-41894
-          sh 'rm -rf ${WORKSPACE}/*'
-        }
-      }
-    } // stage Docs Check
-
     stage('Build Docs') {
       // Build docs separately if only docs changed. If there are other 
changes, docs are
       // already built as part of `make dist`
@@ -657,9 +626,9 @@ pipeline {
         }
       }
       steps {
-        sh '''
-           (cd src/docs && ./setup.sh ; make html)
-         '''
+        sh 'make python-black'
+        sh '(cd src/docs && ./setup.sh  ; make check)'
+        sh '(cd src/docs && make html)'
       }
       post {
         cleanup {
@@ -669,37 +638,6 @@ pipeline {
       }
     } // stage Build Docs
 
-    stage('Source Format Checks') {
-      when {
-        beforeOptions true
-        expression { ONLY_DOCS_CHANGED == '0' && ONLY_GITHUB_CHANGED == '0' }
-      }
-      agent {
-        docker {
-          image "${DOCKER_IMAGE_BASE}-${MINIMUM_ERLANG_VERSION}"
-          label 'docker'
-          args "${DOCKER_ARGS}"
-          registryUrl 'https://docker.io/'
-          registryCredentialsId 'dockerhub_creds'
-        }
-      }
-      steps {
-        sh '''
-          rm -rf apache-couchdb-*
-          ./configure --skip-deps --spidermonkey-version 78
-          make erlfmt-check
-          make elixir-source-checks
-          make python-black
-        '''
-      }
-      post {
-        cleanup {
-          // UGH see https://issues.jenkins-ci.org/browse/JENKINS-41894
-          sh 'rm -rf ${WORKSPACE}/*'
-        }
-      }
-    } // stage Erlfmt
-
     stage('Build Release Tarball') {
       when {
         beforeOptions true
@@ -717,6 +655,9 @@ pipeline {
       steps {
         sh (script: 'rm -rf apache-couchdb-*', label: 'Clean workspace of any 
previous release artifacts' )
         sh "./configure --spidermonkey-version 78 --with-nouveau"
+        sh 'make erlfmt-check'
+        sh 'make elixir-source-checks'
+        sh 'make python-black'
         sh 'make -j4 dist'
       }
       post {