Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A few docs and jenkinsfile cleanups #4171

Merged
merged 3 commits into from
Sep 10, 2022
Merged

A few docs and jenkinsfile cleanups #4171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
939a21c
Reformat jenkinsfile groovy
nickva Sep 9, 2022
26cba30
Fix docs build instructions
nickva Sep 9, 2022
c553ca3
Remove commented out Jenksfile section
nickva Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 18 additions & 80 deletions build-aux/Jenkinsfile.full
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down Expand Up @@ -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" ) {
Expand All @@ -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'
Expand Down Expand Up @@ -312,68 +312,6 @@ 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
*/

stage('Publish') {

when {
Expand All @@ -395,11 +333,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
Expand All @@ -408,14 +346,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
Expand Down
86 changes: 43 additions & 43 deletions build-aux/Jenkinsfile.pr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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')
Expand All @@ -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)
'''
}
Expand All @@ -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}"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions src/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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