You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2022/09/09 16:34:41 UTC
[couchdb] branch fix-jenkins-formatting created (now f1d6ae46a)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch fix-jenkins-formatting
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at f1d6ae46a Fix docs build instructions
This branch includes the following new commits:
new 8f10d799e Reformat jenkinsfile groovy
new f1d6ae46a Fix docs build instructions
The 2 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.
[couchdb] 01/02: Reformat jenkinsfile groovy
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch fix-jenkins-formatting
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 8f10d799ebdd7fa41fef3ae69386fbdc73e2ea1a
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Fri Sep 9 12:32:55 2022 -0400
Reformat jenkinsfile groovy
Go with the 2-indent mode. In emacs it would be:
```
'(groovy-indent-offset 2)
```
---
build-aux/Jenkinsfile.full | 158 ++++++++++++++++++++++-----------------------
build-aux/Jenkinsfile.pr | 86 ++++++++++++------------
2 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 53caab2ef..7516ca402 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -67,10 +67,10 @@ meta = [
],
'bullseye-ppc64': [
- name: 'Debian 11 POWER',
- spidermonkey_vsn: '78',
- image: "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}",
- node_label: 'ppc64le'
+ name: 'Debian 11 POWER',
+ spidermonkey_vsn: '78',
+ image: "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}",
+ node_label: 'ppc64le'
],
'bullseye': [
@@ -117,10 +117,10 @@ def generateNativeStage(platform) {
deleteDir()
unstash 'tarball'
withEnv([
- 'HOME='+pwd(),
- 'PATH+USRLOCAL=/usr/local/bin',
- 'MAKE='+meta[platform].gnu_make
- ]) {
+ 'HOME='+pwd(),
+ 'PATH+USRLOCAL=/usr/local/bin',
+ 'MAKE='+meta[platform].gnu_make
+ ]) {
sh( script: "mkdir -p ${platform}/build", label: 'Create build directories' )
sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1", label: 'Unpack release' )
dir( "${platform}/build" ) {
@@ -137,10 +137,10 @@ def generateNativeStage(platform) {
catch (err) {
sh 'ls -l ${WORKSPACE}'
withEnv([
- 'HOME='+pwd(),
- 'PATH+USRLOCAL=/usr/local/bin',
- 'MAKE='+meta[platform].gnu_make
- ]) {
+ 'HOME='+pwd(),
+ 'PATH+USRLOCAL=/usr/local/bin',
+ 'MAKE='+meta[platform].gnu_make
+ ]) {
dir( "${platform}/build" ) {
sh 'ls -l'
sh '${MAKE} build-report'
@@ -312,67 +312,67 @@ pipeline {
}
}
- /*
- * Example of how to do a qemu-based run, please leave here
- */
-
-/*
- stage('Debian Buster arm64v8') {
- // the process is convoluted to ensure we have the latest qemu static binaries on the node first
- // before trying to run a foreign docker container type. Alternately ensuring the `update_qemu`
- // container is run on every Jenkins agent *after every restart of the Docker daemon* would work.
- agent {
- any {
- }
- }
- options {
- timeout(time: 120, unit: "MINUTES")
- }
- environment {
- platform = 'aarch64-debian-stretch'
- sm_ver = '60'
- }
- stages {
- stage('Install latest qemu binaries') {
- steps {
- sh( script: 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' )
- }
- }
- stage('Pull latest docker image') {
- steps {
- sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-${ERLANG_VERSION}"
- }
- }
- stage('Build from tarball & test & packages') {
- steps {
- withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-${ERLANG_VERSION}", args: "${DOCKER_ARGS}") {
- unstash 'tarball'
- withEnv(['MIX_HOME='+pwd(), 'HEX_HOME='+pwd()]) {
- sh( script: build_and_test )
- sh( script: make_packages )
- sh( script: cleanup_and_save )
- }
- }
- }
- post {
- always {
-*/
-// junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
-/*
- }
- success {
- archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
- }
- }
- }
- } // stages
- post {
- cleanup {
- sh 'rm -rf ${WORKSPACE}/*'
- }
- } // post
- } // stage
-*/
+ /*
+ * Example of how to do a qemu-based run, please leave here
+ */
+
+ /*
+ stage('Debian Buster arm64v8') {
+ // the process is convoluted to ensure we have the latest qemu static binaries on the node first
+ // before trying to run a foreign docker container type. Alternately ensuring the `update_qemu`
+ // container is run on every Jenkins agent *after every restart of the Docker daemon* would work.
+ agent {
+ any {
+ }
+ }
+ options {
+ timeout(time: 120, unit: "MINUTES")
+ }
+ environment {
+ platform = 'aarch64-debian-stretch'
+ sm_ver = '60'
+ }
+ stages {
+ stage('Install latest qemu binaries') {
+ steps {
+ sh( script: 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' )
+ }
+ }
+ stage('Pull latest docker image') {
+ steps {
+ sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-${ERLANG_VERSION}"
+ }
+ }
+ stage('Build from tarball & test & packages') {
+ steps {
+ withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-${ERLANG_VERSION}", args: "${DOCKER_ARGS}") {
+ unstash 'tarball'
+ withEnv(['MIX_HOME='+pwd(), 'HEX_HOME='+pwd()]) {
+ sh( script: build_and_test )
+ sh( script: make_packages )
+ sh( script: cleanup_and_save )
+ }
+ }
+ }
+ post {
+ always {
+ */
+ // junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
+ /*
+ }
+ success {
+ archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+ }
+ }
+ }
+ } // stages
+ post {
+ cleanup {
+ sh 'rm -rf ${WORKSPACE}/*'
+ }
+ } // post
+ } // stage
+ */
stage('Publish') {
@@ -395,11 +395,11 @@ pipeline {
}
steps {
- sh 'rm -rf ${WORKSPACE}/*'
- unstash 'tarball'
- unarchive mapping: ['pkgs/' : '.']
+ sh 'rm -rf ${WORKSPACE}/*'
+ unstash 'tarball'
+ unarchive mapping: ['pkgs/' : '.']
- sh( label: 'Build Debian repo', script: '''
+ sh( label: 'Build Debian repo', script: '''
mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el7 $BRANCH_NAME/el8 $BRANCH_NAME/source
git clone https://github.com/apache/couchdb-pkg
for plat in buster bullseye focal
@@ -408,14 +408,14 @@ pipeline {
done
''' )
- sh( label: 'Build CentOS repos', script: '''
+ sh( label: 'Build CentOS repos', script: '''
#cp js/centos-7/*rpm pkgs/centos7
#cp js/centos-8/*rpm pkgs/centos8
cd pkgs/centos7 && createrepo_c --database .
cd ../centos8 && createrepo_c --database .
''' )
- sh( label: 'Build unified repo', script: '''
+ sh( label: 'Build unified repo', script: '''
mv couchdb-pkg/repo/pool $BRANCH_NAME/debian
mv couchdb-pkg/repo/dists $BRANCH_NAME/debian
mv pkgs/centos7/* $BRANCH_NAME/el7
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index b64a3df6e..0a5996833 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -66,27 +66,27 @@ pipeline {
stage('Setup Env') {
agent {
- docker {
- image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
- label 'docker'
- args "${DOCKER_ARGS}"
- registryUrl 'https://docker.io/'
- registryCredentialsId 'dockerhub_creds'
- }
+ docker {
+ image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
+ label 'docker'
+ args "${DOCKER_ARGS}"
+ registryUrl 'https://docker.io/'
+ registryCredentialsId 'dockerhub_creds'
+ }
}
options {
- timeout(time: 10, unit: 'MINUTES')
+ timeout(time: 10, unit: 'MINUTES')
}
steps {
script {
- env.DOCS_CHANGED = '0'
- env.ONLY_DOCS_CHANGED = '0'
- if ( sh(returnStatus: true, script: docs_changed) == 0 ) {
- env.DOCS_CHANGED = '1'
- if (sh(returnStatus: true, script: other_changes) == 1) {
- env.ONLY_DOCS_CHANGED = '1'
- }
+ env.DOCS_CHANGED = '0'
+ env.ONLY_DOCS_CHANGED = '0'
+ if ( sh(returnStatus: true, script: docs_changed) == 0 ) {
+ env.DOCS_CHANGED = '1'
+ if (sh(returnStatus: true, script: other_changes) == 1) {
+ env.ONLY_DOCS_CHANGED = '1'
}
+ }
}
}
post {
@@ -100,17 +100,17 @@ pipeline {
stage('Docs Check') {
// Run docs `make check` stage if any docs changed
when {
- beforeOptions true
- expression { DOCS_CHANGED == '1' }
+ beforeOptions true
+ expression { DOCS_CHANGED == '1' }
}
agent {
- docker {
- image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
- label 'docker'
- args "${DOCKER_ARGS}"
- registryUrl 'https://docker.io/'
- registryCredentialsId 'dockerhub_creds'
- }
+ docker {
+ image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
+ label 'docker'
+ args "${DOCKER_ARGS}"
+ registryUrl 'https://docker.io/'
+ registryCredentialsId 'dockerhub_creds'
+ }
}
options {
timeout(time: 15, unit: 'MINUTES')
@@ -132,23 +132,23 @@ pipeline {
// Build docs separately if only docs changed. If there are other changes, docs are
// already built as part of `make dist`
when {
- beforeOptions true
- expression { ONLY_DOCS_CHANGED == '1' }
+ beforeOptions true
+ expression { ONLY_DOCS_CHANGED == '1' }
}
agent {
- docker {
- image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
- label 'docker'
- args "${DOCKER_ARGS}"
- registryUrl 'https://docker.io/'
- registryCredentialsId 'dockerhub_creds'
- }
+ docker {
+ image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
+ label 'docker'
+ args "${DOCKER_ARGS}"
+ registryUrl 'https://docker.io/'
+ registryCredentialsId 'dockerhub_creds'
+ }
}
options {
- timeout(time: 30, unit: 'MINUTES')
+ timeout(time: 30, unit: 'MINUTES')
}
steps {
- sh '''
+ sh '''
(cd src/docs && make html)
'''
}
@@ -161,10 +161,10 @@ pipeline {
} // stage Build Docs
stage('Erlfmt') {
- when {
- beforeOptions true
- expression { ONLY_DOCS_CHANGED == '0' }
- }
+ when {
+ beforeOptions true
+ expression { ONLY_DOCS_CHANGED == '0' }
+ }
agent {
docker {
image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
@@ -195,8 +195,8 @@ pipeline {
stage('Make Dist') {
when {
- beforeOptions true
- expression { ONLY_DOCS_CHANGED == '0' }
+ beforeOptions true
+ expression { ONLY_DOCS_CHANGED == '0' }
}
agent {
docker {
@@ -235,8 +235,8 @@ pipeline {
stage('Make Check') {
when {
- beforeOptions true
- expression { ONLY_DOCS_CHANGED == '0' }
+ beforeOptions true
+ expression { ONLY_DOCS_CHANGED == '0' }
}
matrix {
axes {
[couchdb] 02/02: Fix docs build instructions
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch fix-jenkins-formatting
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f1d6ae46a26849919d2e37dbe3bd8d69f2d8c941
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Fri Sep 9 12:33:51 2022 -0400
Fix docs build instructions
As per comment in https://github.com/apache/couchdb/pull/4164#discussion_r965330220
---
src/docs/README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/docs/README.md b/src/docs/README.md
index a53472dc2..4168c1536 100644
--- a/src/docs/README.md
+++ b/src/docs/README.md
@@ -5,7 +5,7 @@ You can view the latest rendered build of this content at:
http://docs.couchdb.org/en/latest
-# Building this repo
+# Building the docs
Install Python3 and pip. Then:
@@ -27,5 +27,3 @@ with issue reporting or contributing to the upkeep of this project.
[1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
[2]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
[3]: https://github.com/apache/couchdb/blob/main/CONTRIBUTING.md
-
-