build script updates for el7/ci

This commit is contained in:
Michael James 2017-10-30 16:21:12 -04:00
parent 8a02f28d58
commit 3500f97b0d
6 changed files with 57 additions and 153 deletions

View file

@ -107,10 +107,8 @@ function build_qpid() {
}
function build_python() {
#noarch
buildRPM "awips2-python-nose"
buildRPM "awips2-python-pupynere"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-werkzeug"
#x86_64
buildRPM "awips2-python"
@ -122,12 +120,11 @@ function build_python() {
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jep"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-numexpr"
buildRPM "awips2-python-numpy"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-pyparsing"
buildRPM "awips2-python-pytz"
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-setuptools"
buildRPM "awips2-python-shapely"
buildRPM "awips2-python-six"
@ -148,13 +145,9 @@ function build_server() {
buildRPM "awips2-java"
buildRPM "awips2-ldm"
buildRPM "awips2-tools"
buildRPM "aiwps2-httpd-pypies"
buildRPM "awips2-httpd-pypies"
buildRPM "awips2-pypies"
buildRPM "awips2-notification"
buildRPM "awips2-common-base"
buildRPM "awips2-adapt-native"
buildRPM "awips2-cli"
buildRPM "awips2-edex-environment"
buildRPM "awips2-edex-upc"
buildLocalization
}

View file

@ -1,61 +1,40 @@
#!/bin/bash -v
set -xe
if [[ ${2} = "buildCAVE" ]]; then
rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
rm -rf /awips2/jenkins/buildspace/workspace/tmp/mjames/
fi
export JENKINS_WORKSPACE=/awips2/repo/awips2-builds
# determine where we are ...
# Determine where we are
path_to_script=`readlink -f $0`
dir=$(dirname $path_to_script)
source ${dir}/buildEnvironment.sh
export _script_dir=${dir}
echo "Running build.sh from ${_script_dir}"
echo " JENKINS_WORKSPACE = ${JENKINS_WORKSPACE}"
#/bin/bash ${_script_dir}/build2.sh
#echo "Entering the build2.sh script"
cd ${dir}
logdir=${dir}/../logs
START_TIME=`date "+%s"`
timestamp=`date +%Y_%m_%d_%H:%M:%S`
# set all awips2 components into the path.
#export PATH=/awips2/java/bin:/awips2/python/bin:/awips2/ant/bin:/usr/local/heroku/bin:/home/mjames/util:/awips2/eclipse:/usr/lib64/qt-3.3/bin:/bin:/usr/local/bin:/bin:/usr/bin:/usr/ccs/bin
#export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:${LD_LIBRARY_PATH}
export JAVA_HOME=/awips2/java
export ANT_HOME=/awips2/ant
# determine where we are ...
path_to_script=`readlink -f $0`
dir=$(dirname $path_to_script)
cd ${dir}
logdir=${dir}/../logs
# prepare the build environment (since we are manually executed)
source ${dir}/buildEnvironment.sh
# Cleanup before building CAVE rpms
if [[ ${2} = "buildCAVE" ]]; then
rm -rf ${JENKINS_HOME}/buildspace/workspace/AWIPS2-UPC_build/baseline/
rm -rf ${JENKINS_HOME}/buildspace/workspace/tmp/${USER}/
fi
echo "BUILD_DIR = $BUILD_DIR"
echo "BUILD_WORKSPACE = $BUILD_WORKSPACE"
echo "BASELINE = $BASELINE"
echo "WORKSPACE = $WORKSPACE"
echo "AWIPSII_VERSION = $AWIPSII_VERSION"
echo "AWIPSII_RELEASE = $AWIPSII_RELEASE"
echo "AWIPSII_TOP_DIR = $AWIPSII_TOP_DIR"
echo "WORKSPACE = $WORKSPACE"
echo "UFRAME_ECLIPSE = $UFRAME_ECLIPSE"
echo "AWIPSII_STATIC_FILES = $AWIPSII_STATIC_FILES"
echo "AWIPSII_BUILD_ROOT = $AWIPSII_BUILD_ROOT"
# prepare the rpm build directory structure
mkdir -p ${AWIPSII_TOP_DIR}/BUILD
mkdir -p ${AWIPSII_TOP_DIR}/RPMS
mkdir -p ${AWIPSII_TOP_DIR}/SOURCES
mkdir -p ${AWIPSII_TOP_DIR}/SPECS
mkdir -p ${AWIPSII_TOP_DIR}/SRPMS
echo BASELINE is ${BASELINE}
echo WORKSPACE is ${WORKSPACE}
# Prepare the rpm build directory structure
mkdir -p ${AWIPSII_TOP_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
# prepare the baseline
pushd . > /dev/null 2>&1
cd ${BASELINE}
mkdir -p ${WORKSPACE}
@ -73,20 +52,7 @@ pushd . > /dev/null 2>&1
cd ${_build_sh_directory}
cp -v ${dir}/buildEnvironment.sh .
#Usage: build.sh OPTION [-nobinlightning]
# -delta perform a build of only the rpms that are likely to change.
# -full perform a full build of all the rpms.
# -ade build all rpms that are packaged in the ade.
# -viz only build the Viz rpms (CAVE & AlertViz).
# -edex only build the EDEX rpms.
# -qpid build only the QPID rpms.
# -ldm build the awips2-ldm rpm; requires root privileges.
# -package create a yum repository tar file with the rpms that were just built.
# --help display this message and exit.
#
# check rpms/build/x86_64/build.sh for these groups
#
pwd
# check rpms/build/x86_64/build.sh for build groups
build_log=${dir}/build${1}-${timestamp}.log
if [ "${1}" = "-b" -a -n "${2}" ]; then
@ -100,10 +66,10 @@ popd > /dev/null 2>&1
export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
fi
END_TIME=`date "+%s"`

View file

@ -1,30 +1,24 @@
#!/bin/bash
# Version
export AWIPSII_VERSION="17.1.1"
export AWIPSII_RELEASE="4"
# User-configurable environment parameters that are used during the build.
# The baseline parameter is specific to non-Jenkins / non-Hudson builds
# Author
export AWIPSII_BUILD_VENDOR="UCAR"
export AWIPSII_BUILD_SITE="Unidata"
export BUILD_DIR=/awips2/jenkins/buildspace/
# Not sure why, but ld isn't finding /awips2/python/lib/libpython2.7.so
# Need to create sym link:
# /usr/lib64/libpython2.7.so -> /awips2/python/lib/libpython2.7.so
#export LD_LIBRARY_PATH=/awips2/python/lib:/usr/lib64
export AWIPSII_AUTHOR="Michael James <mjames@ucar.edu>"
# Directories
export UFRAME_ECLIPSE=/awips2/eclipse
export JAVA_HOME=/awips2/java
export ANT_HOME=/awips2/ant
export REPO=/awips2/repo
export JENKINS_HOME=/awips2/jenkins
export JENKINS_WORKSPACE=${REPO}/awips2-builds
export BUILD_DIR=${JENKINS_HOME}/buildspace/
export AWIPSII_STATIC_FILES=${REPO}/awips2-static
# More env vars
export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
# WORKSPACE is to be removed and created, this should be a new directory
export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline"
export UFRAME_ECLIPSE="/awips2/eclipse"
export AWIPSII_STATIC_FILES="/awips2/repo"
export AWIPSII_STATIC_FILES="/awips2/repo/awips2-static"
export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component"
export REPO_DEST="${BUILD_WORKSPACE}/tmp/${USER}/repo"
export BASELINE=${JENKINS_WORKSPACE}
export AWIPSII_TOP_DIR=${BUILD_WORKSPACE}/tmp/rpms_built_dir
export WORKSPACE=${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline
export AWIPSII_BUILD_ROOT=${BUILD_WORKSPACE}/tmp/${USER}/awips-component
export REPO_DEST=${BUILD_WORKSPACE}/tmp/${USER}/repo

View file

@ -1,61 +1,39 @@
#!/bin/bash
#!/bin/bash -v
set -xe
if [[ ${2} = "buildCAVE" ]]; then
rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
rm -rf /awips2/jenkins/buildspace/workspace/tmp/mjames/
fi
export JENKINS_WORKSPACE=/awips2/repo/awips2-builds
# determine where we are ...
# Determine where we are
path_to_script=`readlink -f $0`
dir=$(dirname $path_to_script)
source ${dir}/buildEnvironment.sh
export _script_dir=${dir}
echo "Running build.sh from ${_script_dir}"
echo " JENKINS_WORKSPACE = ${JENKINS_WORKSPACE}"
#/bin/bash ${_script_dir}/build2.sh
#echo "Entering the build2.sh script"
cd ${dir}
START_TIME=`date "+%s"`
timestamp=`date +%Y_%m_%d_%H:%M:%S`
# set all awips2 components into the path.
#export PATH=/awips2/java/bin:/awips2/python/bin:/awips2/ant/bin:/usr/local/heroku/bin:/home/mjames/util:/awips2/eclipse:/usr/lib64/qt-3.3/bin:/bin:/usr/local/bin:/bin:/usr/bin:/usr/ccs/bin
#export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:${LD_LIBRARY_PATH}
export JAVA_HOME=/awips2/java
export ANT_HOME=/awips2/ant
# determine where we are ...
path_to_script=`readlink -f $0`
dir=$(dirname $path_to_script)
cd ${dir}
logdir=${dir}/../logs
# prepare the build environment (since we are manually executed)
source ${dir}/buildEnvironment.sh
# Cleanup before building CAVE rpms
if [[ ${2} = "buildCAVE" ]]; then
rm -rf ${JENKINS_HOME}/buildspace/workspace/AWIPS2-UPC_build/baseline/
rm -rf ${JENKINS_HOME}/buildspace/workspace/tmp/${USER}/
fi
echo "BUILD_DIR = $BUILD_DIR"
echo "BUILD_WORKSPACE = $BUILD_WORKSPACE"
echo "BASELINE = $BASELINE"
echo "WORKSPACE = $WORKSPACE"
echo "AWIPSII_VERSION = $AWIPSII_VERSION"
echo "AWIPSII_RELEASE = $AWIPSII_RELEASE"
echo "AWIPSII_TOP_DIR = $AWIPSII_TOP_DIR"
echo "WORKSPACE = $WORKSPACE"
echo "UFRAME_ECLIPSE = $UFRAME_ECLIPSE"
echo "AWIPSII_STATIC_FILES = $AWIPSII_STATIC_FILES"
echo "AWIPSII_BUILD_ROOT = $AWIPSII_BUILD_ROOT"
# prepare the rpm build directory structure
mkdir -p ${AWIPSII_TOP_DIR}/BUILD
mkdir -p ${AWIPSII_TOP_DIR}/RPMS
mkdir -p ${AWIPSII_TOP_DIR}/SOURCES
mkdir -p ${AWIPSII_TOP_DIR}/SPECS
mkdir -p ${AWIPSII_TOP_DIR}/SRPMS
echo BASELINE is ${BASELINE}
echo WORKSPACE is ${WORKSPACE}
# Prepare the rpm build directory structure
mkdir -p ${AWIPSII_TOP_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
# prepare the baseline
pushd . > /dev/null 2>&1
cd ${BASELINE}
mkdir -p ${WORKSPACE}
@ -73,32 +51,17 @@ pushd . > /dev/null 2>&1
cd ${_build_sh_directory}
cp -v ${dir}/buildEnvironment.sh .
#Usage: build.sh OPTION [-nobinlightning]
# -delta perform a build of only the rpms that are likely to change.
# -full perform a full build of all the rpms.
# -ade build all rpms that are packaged in the ade.
# -viz only build the Viz rpms (CAVE & AlertViz).
# -edex only build the EDEX rpms.
# -qpid build only the QPID rpms.
# -ldm build the awips2-ldm rpm; requires root privileges.
# -package create a yum repository tar file with the rpms that were just built.
# --help display this message and exit.
#
# check rpms/build/x86_64/build.sh for these groups
#
pwd
/bin/bash ${_build_sh_directory}/build.sh ${1} ${2}
/bin/bash ${_build_sh_directory}/build.sh ${1} ${2}
popd > /dev/null 2>&1
export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
fi
END_TIME=`date "+%s"`

View file

@ -20,20 +20,17 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-pmw</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
<packagereq type="default">awips2-python-tpg</packagereq>
<packagereq type="default">awips2-python-werkzeug</packagereq>
</packagelist>
</group>
@ -73,20 +70,17 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-pmw</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
<packagereq type="default">awips2-python-tpg</packagereq>
<packagereq type="default">awips2-python-werkzeug</packagereq>
</packagelist>
</group>
@ -119,14 +113,13 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
@ -180,14 +173,13 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
@ -243,14 +235,13 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
@ -282,19 +273,16 @@
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-matplotlib</packagereq>
<packagereq type="default">awips2-python-nose</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-pmw</packagereq>
<packagereq type="default">awips2-python-numexpr</packagereq>
<packagereq type="default">awips2-python-pupynere</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
<packagereq type="default">awips2-python-tpg</packagereq>
<packagereq type="default">awips2-python-werkzeug</packagereq>
<packagereq type="default">awips2-cave</packagereq>
<packagereq type="default">awips2-cave-wrapper</packagereq>

View file

@ -8,7 +8,7 @@ repomanage -k1 --old . | xargs rm -f
createrepo -g ./comps.xml .
unset LD_LIBRARY_PATH
#. /etc/profile.d/awips2.sh
rsync --archive --delete $RPMDIR js-17-218.jetstream-cloud.org:/awips2/repo/awips2_17.1.1
#rsync --archive --delete $RPMDIR js-17-218.jetstream-cloud.org:/awips2/repo/awips2_17.1.1
cd ..
#rm -rf awips2_${AWIPSII_VERSION}.tar