From 32800571d9e9fe2dc786ca17aef3880fbb72b5de Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Thu, 26 Oct 2017 17:18:02 -0600 Subject: [PATCH] account for el7 repo, add comps file and create repo for tarball on ci --- build/build_rhel.sh | 16 ++- rpms/unidata/comps.xml | 305 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 319 insertions(+), 2 deletions(-) create mode 100644 rpms/unidata/comps.xml diff --git a/build/build_rhel.sh b/build/build_rhel.sh index 998085ceba..01f33698ee 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -3,14 +3,17 @@ OS_TYPE=$1 OS_VERSION=$2 if [ $OS_VERSION == "centos7" ]; then REPO_EXT="-el7" + repo_name="el7.repo" +else + repo_name="awips-dev.repo" fi groupadd fxalpha && useradd -G fxalpha awips yum -y clean all yum -y clean expire-cache yum groupinstall "Development tools" -y >& /dev/null -yum install wget qt-devel cmake gcc gcc-c++ ruby boost-devel libuuid-devel tk-devel tcl-devel rsync git net-tools rpm-build -y -wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips-dev.repo +yum install wget qt-devel cmake gcc gcc-c++ ruby boost-devel libuuid-devel tk-devel tcl-devel rsync git net-tools rpm-build netcdf-devel -y +wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/${repo_name} yum -y clean all yum groupinstall awips2-ade -y @@ -42,4 +45,13 @@ cd /awips2/repo/awips2-builds/rpms/unidata/ /bin/bash cibuild.sh -b buildEDEX >& /dev/null /bin/bash cibuild.sh -b buildCAVE >& /dev/null +export RPMDIR=/awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ +export LD_LIBRARY_PATH=/usr/lib:/lib:/usr/lib64:/lib64 +cp comps.xml ${RPMDIR} +cd ${RPMDIR} +repomanage -k1 --old . | xargs rm -f +createrepo -g ./comps.xml . +unset LD_LIBRARY_PATH +. /etc/profile.d/awips2.sh + tar -cf /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ /awips2/repo/awips2-src/dist/awips2_${AWIPSII_VERSION}_${OS_TYPE}-${OS_VERSION}.tar diff --git a/rpms/unidata/comps.xml b/rpms/unidata/comps.xml new file mode 100644 index 0000000000..0dac177368 --- /dev/null +++ b/rpms/unidata/comps.xml @@ -0,0 +1,305 @@ + + + awips2-ade + AWIPS Development + true + This Will Install All Of The AWIPS Components That Are Required For Deploying in Eclipse (non DB) + true + + awips2 + awips2-java + awips2-eclipse + awips2-ant + awips2-maven + awips2-groovy + awips2-python + awips2-python-awips + awips2-python-cython + awips2-python-dateutil + awips2-python-gfe + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pmw + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-qpid + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-tables + awips2-python-tpg + awips2-python-werkzeug + + + + awips2-ade-server + AWIPS ADE SERVER + true + This Will Install All Of The AWIPS Components That Are Required For Deploying EDEX services locally and in Eclipse. + true + + awips2 + awips2-eclipse + awips2-ant + awips2-maven + awips2-java + awips2-groovy + awips2-postgresql + awips2-psql + awips2-database + awips2-httpd-pypies + awips2-qpid-java-client + awips2-qpid-java-common + awips2-qpid-java-broker + awips2-qpid-lib + awips2-localization + awips2-ldm + awips2-edex-upc + awips2-tools + awips2-maps-database + awips2-data.hdf5-topo + awips2-ncep-database + awips2-python + awips2-python-awips + awips2-python-cython + awips2-python-dateutil + awips2-python-gfe + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pmw + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-qpid + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-tables + awips2-python-tpg + awips2-python-werkzeug + + + + awips2-ingest + AWIPS EDEX Decode/Ingest Node (No Database, PyPIES, GFE) + true + + true + + awips2 + awips2-common-base + awips2-psql + awips2-edex + awips2-edex-base + awips2-edex-common-core + awips2-edex-configuration + awips2-edex-core + awips2-edex-cots + awips2-edex-dataplugins + awips2-edex-ncep + awips2-edex-upc + awips2-java + awips2-ldm + awips2-python + awips2-python-awips + awips2-python-cycler + awips2-python-cython + awips2-python-dateutil + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-qpid + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-werkzeug + awips2-qpid-java-broker + awips2-qpid-java-client + awips2-qpid-java-common + awips2-qpid-lib + awips2-tools + awips2-yajsw + + + + awips2-database + AWIPS EDEX Database/Request Server + true + This Will Install All Of The AWIPS Components That Are Required For A Standalone Request/Database Environment. + true + + awips2 + awips2-cli + awips2-common-base + awips2-database + awips2-data.gfe + awips2-data.hdf5-topo + awips2-edex + awips2-edex-base + awips2-edex-common-core + awips2-edex-configuration + awips2-edex-core + awips2-edex-cots + awips2-edex-dataplugins + awips2-edex-gfe + awips2-gfesuite + awips2-edex-ncep + awips2-edex-shapefiles + awips2-edex-upc + awips2-edex-request + awips2-httpd-pypies + awips2-java + awips2-maps-database + awips2-ncep-database + awips2-postgresql + awips2-psql + awips2-pypies + awips2-python + awips2-python-awips + awips2-python-cycler + awips2-python-cython + awips2-python-dateutil + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-qpid + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-werkzeug + awips2-qpid-java-broker + awips2-qpid-java-client + awips2-qpid-java-common + awips2-qpid-lib + awips2-tools + awips2-localization + awips2-yajsw + mod_ssl + + + + awips2-server + AWIPS EDEX Server + true + This Will Install All Of The AWIPS Components That Are Required For A Standalone / ADAM Environment. + true + + awips2 + awips2-cli + awips2-common-base + awips2-database + awips2-data.gfe + awips2-data.hdf5-topo + awips2-edex + awips2-edex-base + awips2-edex-common-core + awips2-edex-configuration + awips2-edex-core + awips2-edex-cots + awips2-edex-dataplugins + awips2-edex-gfe + awips2-gfesuite + awips2-edex-ncep + awips2-edex-shapefiles + awips2-edex-upc + awips2-httpd-pypies + awips2-java + awips2-ldm + awips2-maps-database + awips2-ncep-database + awips2-postgresql + awips2-psql + awips2-pypies + awips2-python + awips2-python-awips + awips2-python-cycler + awips2-python-cython + awips2-python-dateutil + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-qpid + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-werkzeug + awips2-qpid-java-broker + awips2-qpid-java-client + awips2-qpid-java-common + awips2-qpid-lib + awips2-tools + awips2-localization + awips2-yajsw + mod_ssl + + + + awips2-cave + AWIPS CAVE + true + This Will Install The AWIPS Visualization Environment Including: CAVE, AlertViz, ... + true + + awips2 + awips2-java + awips2-python + awips2-python-awips + awips2-python-cython + awips2-python-dateutil + awips2-python-gfe + awips2-python-h5py + awips2-python-jep + awips2-python-matplotlib + awips2-python-nose + awips2-python-numpy + awips2-python-pmw + awips2-python-pupynere + awips2-python-pyparsing + awips2-python-pytz + awips2-python-scientific + awips2-python-scipy + awips2-python-setuptools + awips2-python-shapely + awips2-python-six + awips2-python-tables + awips2-python-tpg + awips2-python-werkzeug + awips2-cave + awips2-cave-wrapper + awips2-gfesuite + awips2-notification + + +