Skip to content

Commit 1e93a9c

Browse files
rautericbwbarrett
authored andcommitted
Clean-up: add status updates in build-rpm.sh
Also, clarify comments in create-tarball.groovy Signed-off-by: Eric Raut <eraut@amazon.com>
1 parent 66901cb commit 1e93a9c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

jenkins/open-mpi.dist.create-tarball.build-rpm.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,33 @@ aws s3 cp ${build_prefix}/${srpm_name} ${srpm_name}
1818

1919
# Build and install PRRTE and OpenPMIX, if available
2020
if [[ -d ${WORKSPACE}/ompi/3rd-party/openpmix ]]; then
21+
echo "Building OpenPMIx RPM"
2122
pushd ${WORKSPACE}/ompi/3rd-party/openpmix
2223
./autogen.pl; ./configure; make dist
2324
cd contrib
2425
tarball=$(find .. -name "*.bz2" -print)
2526
rpmtopdir="${WORKSPACE}/rpmbuild" build_srpm=no build_single=yes ./buildrpm.sh $tarball
2627
rpm_name=$(find ${WORKSPACE}/rpmbuild/RPMS -name "pmix*.rpm" -print)
28+
echo "Installing OpenPMIx RPM"
2729
sudo rpm -Uvh ${rpm_name}
2830
popd
2931
fi
3032

3133
if [[ -d ${WORKSPACE}/ompi/3rd-party/prrte ]]; then
34+
echo "Building PRRTE RPM"
3235
pushd ${WORKSPACE}/ompi/3rd-party/prrte
3336
./autogen.pl; ./configure; make dist
3437
cd contrib/dist/linux
3538
tarball=$(find ../../.. -name "*.bz2" -print)
3639
rpmtopdir="${WORKSPACE}/rpmbuild" ./buildrpm.sh -b "${tarball}"
3740
rpm_name=$(find ${WORKSPACE}/rpmbuild/RPMS -name "prrte*.rpm" -print)
41+
echo "Installing PRRTE RPM"
3842
sudo rpm -Uvh ${rpm_name}
3943
popd
4044
fi
4145

46+
echo "Building Open MPI RPM"
4247
rpmbuild --rebuild ${srpm_name}
4348
bin_rpm_name=`find ${WORKSPACE}/rpmbuild/RPMS -name "openmpi*.rpm" -print`
49+
echo "Installing Open MPI RPM"
4450
sudo rpm -Uvh ${bin_rpm_name}

jenkins/open-mpi.dist.create-tarball.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,14 @@ parallel (
109109
node(manpage_builder) {
110110
stage('Build Man Pages') {
111111
checkout_code();
112-
// Check if we need to build man pages
112+
// Open MPI 5.0 and later auto-build docs on readthedocs.io, so we do not need to build manpages for www.open-mpi.org.
113+
// Skip this step if we find readthedocs input files.
113114
if (sh(script: "test -f ${WORKSPACE}/ompi/docs/history.rst", returnStatus: true) != 0) {
114115
sh "ls -lR . ; /bin/bash ompi-scripts/jenkins/open-mpi.dist.create-tarball.build-manpages.sh ${build_prefix} ${tarball} ${branch}"
115116
artifacts = sh(returnStdout:true, script:'cat ${WORKSPACE}/manpage-build-artifacts.txt').trim()
116117
currentBuild.description="${currentBuild.description}<b>Manpages:</b> <A HREF=\"${artifacts}\">${artifacts}</A><BR>\n"
117118
} else {
118-
echo "Using RST; skipping building man pages"
119+
echo "Using ReadTheDocs; skipping building man pages"
119120
}
120121
}
121122
}

0 commit comments

Comments
 (0)