From 6e43afed27bcc8e464067aa995c094767a699780 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 7 Sep 2021 10:31:22 +0000 Subject: [PATCH 1/2] fix pbspro build: add wget, specify path to rpmbuild and correct spec file name --- specs/default/cluster-init/files/00-build-pbspro.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specs/default/cluster-init/files/00-build-pbspro.sh b/specs/default/cluster-init/files/00-build-pbspro.sh index 5f1e7da..2b7f578 100755 --- a/specs/default/cluster-init/files/00-build-pbspro.sh +++ b/specs/default/cluster-init/files/00-build-pbspro.sh @@ -14,7 +14,7 @@ rpmdev-setuptree #yum install -y gcc autoconf automake hwloc-devel libX11-devel libXt-devel libedit-devel libical-devel ncurses-devel perl postgresql-devel python-devel==2.7.5-77.el7_6 tcl-devel tk-devel swig expat-devel openssl-devel yum install -y gcc make rpm-build libtool hwloc-devel libX11-devel libXt-devel libedit-devel libical-devel ncurses-devel perl postgresql-devel python-devel tcl-devel tk-devel swig expat-devel openssl-devel libXext libXft yum install -y expat libedit postgresql-server python sendmail sudo tcl tk libical -yum install -y python-pip which net-tools +yum install -y python-pip which net-tools wget wget "${DOWNLOAD_URL}/${OPENPBS_PKG}" tar xzf ${OPENPBS_PKG} @@ -22,9 +22,9 @@ cd $OPENPBS_FOLDER ./autogen.sh ./configure make dist -mv $OPENPBS_DIST ../rpmbuild/SOURCES -cp -f openpbs.spec ../rpmbuild/SPECS -cd ~/rpmbuild/SPECS -rpmbuild -ba openpbs.spec +mv $OPENPBS_DIST /root/rpmbuild/SOURCES +cp -f pbspro.spec /root/rpmbuild/SPECS +cd /root/rpmbuild/SPECS +rpmbuild -ba pbspro.spec From 2e289082dd1270b34964043235a1327b6a266c56 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Sep 2021 07:58:52 +0000 Subject: [PATCH 2/2] adding openpbs for el7 next to pbspro --- docker-rpmbuild.sh | 3 ++ .../cluster-init/files/00-build-openpbs.sh | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 specs/default/cluster-init/files/00-build-openpbs.sh diff --git a/docker-rpmbuild.sh b/docker-rpmbuild.sh index 30d74ec..2d9ccad 100755 --- a/docker-rpmbuild.sh +++ b/docker-rpmbuild.sh @@ -1,7 +1,10 @@ #!/bin/bash if command -v docker; then + # building pbspro 18.1.4 rpm's docker run -v $(pwd)/specs/default/cluster-init/files:/source -v $(pwd)/blobs:/root/rpmbuild/RPMS/x86_64 -ti centos:7 /bin/bash -e /source/00-build-pbspro.sh + # building openpbs 20.0.1 rpm's + docker run -v $(pwd)/specs/default/cluster-init/files:/source -v $(pwd)/blobs:/root/rpmbuild/RPMS/x86_64 -ti centos:7 /bin/bash -e /source/00-build-openpbs.sh else echo "`docker` binary not found. Install docker to build RPMs with this script" fi diff --git a/specs/default/cluster-init/files/00-build-openpbs.sh b/specs/default/cluster-init/files/00-build-openpbs.sh new file mode 100755 index 0000000..268f48a --- /dev/null +++ b/specs/default/cluster-init/files/00-build-openpbs.sh @@ -0,0 +1,30 @@ +#!/bin/bash -e + +OPENPBS_VERSION="20.0.1" +OPENPBS_FOLDER="openpbs-${OPENPBS_VERSION}" +OPENPBS_PKG="v${OPENPBS_VERSION}.tar.gz" +OPENPBS_DIST=openpbs-${OPENPBS_VERSION}.tar.gz +DOWNLOAD_URL="https://github.com/openpbs/openpbs/archive/refs/tags" + +# see https://openpbs.atlassian.net/wiki/spaces/PBSPro/pages/13991940/Building+PBS+Pro+Using+rpmbuild +yum install -y rpmdevtools +rpmdev-setuptree + +# Install other build deps +#yum install -y gcc autoconf automake hwloc-devel libX11-devel libXt-devel libedit-devel libical-devel ncurses-devel perl postgresql-devel python-devel==2.7.5-77.el7_6 tcl-devel tk-devel swig expat-devel openssl-devel +yum install -y gcc make rpm-build libtool hwloc-devel libX11-devel libXt-devel libedit-devel libical-devel ncurses-devel perl postgresql-devel python-devel tcl-devel tk-devel swig expat-devel openssl-devel libXext libXft +yum install -y expat libedit postgresql-server python sendmail sudo tcl tk libical +yum install -y python-pip which net-tools wget python36 python36-devel libtool-ltdl-devel postgresql-contrib +wget "${DOWNLOAD_URL}/${OPENPBS_PKG}" +tar xzf ${OPENPBS_PKG} + +cd $OPENPBS_FOLDER +./autogen.sh +./configure +make dist +mv $OPENPBS_DIST /root/rpmbuild/SOURCES +cp -f openpbs.spec /root/rpmbuild/SPECS +cd /root/rpmbuild/SPECS +rpmbuild -ba openpbs.spec + +