Merge remote-tracking branch 'unidata/unidata_17.1.1' into unidata_17.1.1-osx

This commit is contained in:
Michael James 2017-10-24 10:55:49 -06:00
commit e120295bf9
13 changed files with 127 additions and 106 deletions

View file

@ -5,7 +5,7 @@ OS_VERSION=$2
yum -y clean all
yum -y clean expire-cache
yum groupinstall "Development tools" -y >& /dev/null
yum install wget cmake ruby -y
yum install wget cmake ruby boost-devel libuuid-devel -y
wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo
yum -y clean all
yum groupinstall awips2-ade -y >& /dev/null
@ -16,6 +16,7 @@ yum install git -y >& /dev/null
mkdir -p /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline
mkdir -p /awips2/jenkins/buildspace/workspace/tmp
mkdir -p /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
mkdir -p /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
pushd /awips2/repo
@ -28,7 +29,7 @@ git clone https://github.com/Unidata/awips2-nws.git --branch unidata_${AWIPSII_V
cd /awips2/repo/awips2-builds/rpms/unidata/
/bin/bash build.sh -qpid
/bin/bash build.sh -b buildEDEX
/bin/bash cibuild.sh -qpid
/bin/bash cibuild.sh -b buildEDEX >& /dev/null
find /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/

View file

@ -1,5 +1,4 @@
export AW_SITE_IDENTIFIER=OAX
export EDEX_SERVER=localhost
export EXT_ADDR=external
# database
@ -10,11 +9,11 @@ export IH_DB_NAME=hd_ob92oax
export DATA_ARCHIVE_ROOT=/awips2/data_store
# postgres connection
export DB_ADDR=${EDEX_SERVER}
export DB_ADDR=localhost
export DB_PORT=5432
# qpid connection
export BROKER_ADDR=${EDEX_SERVER}
export BROKER_ADDR=localhost
# pypies hdf5 connection
export PYPIES_SERVER=http://${EXT_ADDR}:9582
@ -24,7 +23,7 @@ export HTTP_PORT=9581
export HTTP_SERVER_PATH=/services
export HTTP_SERVER=http://${EXT_ADDR}:${HTTP_PORT}${HTTP_SERVER_PATH}
# for manualIngest this needs to be localhost(??)
export JMS_SERVER=tcp://${EDEX_SERVER}:5672
export JMS_SERVER=tcp://${EXT_ADDR}:5672
export JMS_VIRTUALHOST=edex
export JMS_CONNECTIONS_URL=http://${EXT_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST}

View file

@ -80,7 +80,7 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter {
private static String[] supportedPlugins = { "obs", "modelsounding",
"bufrssmi", "lsr", "sfcobs", "goessounding", "bufrascat",
"poessounding", "bufrua", "qc", "fssobs", "bufrmosAVN",
"bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", "airep", "pirep", "nctaf" };
"bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", "airep", "pirep" };
protected AbstractPointDataInventory inventory;

View file

@ -104,7 +104,7 @@ utility-request
acars-common, acars-common-dataaccess, acarssounding-common, activetable-common, activetable-request, airep-common, airep-common-dataaccess, airmet-common, alertviz-request, archiveadmim-request, atcf-common, auth-request, awipstools-request, aww-common, binlightning-common, binlightning-common-dataaccess, bufrascat-common, bufrhdw-common, bufrmos-common, bufrmos-common-dataaccess, bufrmthdw-common, bufrncwf-common, bufrsigwx-common, bufrssmi-common, bufrua-common, bufrua-common-dataaccess, bufrua-request, ccfp-common, climate-common-dataaccess, climate-hmdb-common, convectprob-common, convsigmet-common, cwa-common, cwat-common, dat-request, dataaccess-common, dataaccess-request, database-common, database-request, datadelivery-common, dd-request-router, dissemination-request, dmw-common, ebxml-registry-common, ebxml-request-router, edex-message-common, edex-request, event-common, event-datadelivery-common, eventbus-common, ffg-common, ffmp-common, ffmp-dataplugin-common, fog-common, fssobs-common, gempak-common, gempak-request, geo-common, geomag-common, geomag-request, gfe-common, gfe-dataplugin-common, gfe-request, ghcd-common, ghcd-request, goessounding-common, gpd-common, gpd-request, grid-common, grid-dataplugin-common, grid-request, gridcoverage-common, hpe-request, hydro-common, idft-common, intlsigmet-common, level-common, levelhandler-common, localization-http-request, lsr-common, manualIngest-common, manualIngest-request, maps-dataplugin-common, mcidas-common, menus-request, message-common, modelsounding-common, modelsounding-common-dataaccess, modis-common, mosaic-common, mping-common, ncep-common, ncgrib-request, ncpafm-common, ncscat-common, nctaf-common, nctext-common, ncuair-common, nonconvsigmet-common, ntrans-common, nucaps-common, obs-common, obs-common-dataaccess, obs-message-common, obstation-dataplugin-common, ohd-common, ohd-common-database, ohd-request, parameter-common, persist-request, pgen-common, pgen-request, pirep-common, pirep-common-dataaccess, poessounding-common, pointdata-common, pointdata-request, pointset-common, preciprate-common, profiler-common, profiler-common-dataaccess, qc-common, qpf-common, radar-common, radar-dataplugin-common, radar-request, redbook-common, remotescript-request, request-service, request-service-common, rpgenvdata-request, satellite-common, satellite-dataplugin-common, satellite-request, scan-common, sfcobs-common, sfcobs-common-dataaccess, sgwh-common, sgwhv-common, shef-common, site-common, site-request, solarimage-common, soundingrequest-request, ssha-common, stats-common, stats-request, stormtrack-common, stq-common, svrwx-common, taf-common, tcg-common, tcm-common, tcs-common, text-common, text-dbsrv-common, text-dbsrv-request, text-request, text-subscription-common, text-subscription-request, time-common, topo-dataaccess-common, uengine-request, units-common, useradmin-common, useradmin-request, utility-common, utility-request, vaa-common, viirs-common, vil-common, warning-common, warning-common-dataaccess, warning-request, wcp-common
acars-common, acars-common-dataaccess, acarssounding-common, activetable-common, activetable-request, airep-common, airep-common-dataaccess, airmet-common, alertviz-request, archiveadmim-request, atcf-common, auth-request, awipstools-request, aww-common, binlightning-common, binlightning-common-dataaccess, bufrascat-common, bufrhdw-common, bufrmos-common, bufrmos-common-dataaccess, bufrmthdw-common, bufrncwf-common, bufrsigwx-common, bufrssmi-common, bufrua-common, bufrua-common-dataaccess, bufrua-request, ccfp-common, climate-common-dataaccess, climate-hmdb-common, convectprob-common, convsigmet-common, cwa-common, cwat-common, dat-request, dataaccess-common, dataaccess-request, database-common, database-request, datadelivery-common, dd-request-router, dissemination-request, dmw-common, ebxml-registry-common, ebxml-request-router, edex-message-common, edex-request, event-common, event-datadelivery-common, eventbus-common, ffg-common, ffmp-common, ffmp-dataplugin-common, fog-common, fssobs-common, gempak-common, gempak-request, geo-common, geomag-common, geomag-request, gfe-common, gfe-dataplugin-common, gfe-request, ghcd-common, ghcd-request, goessounding-common, gpd-common, gpd-request, grid-common, grid-dataplugin-common, grid-request, gridcoverage-common, hpe-request, hydro-common, idft-common, intlsigmet-common, level-common, levelhandler-common, localization-http-request, lsr-common, manualIngest-common, manualIngest-request, maps-dataplugin-common, mcidas-common, menus-request, message-common, modelsounding-common, modelsounding-common-dataaccess, modis-common, mosaic-common, mping-common, ncep-common, ncgrib-request, ncpafm-common, ncscat-common, nctext-common, ncuair-common, nonconvsigmet-common, ntrans-common, nucaps-common, obs-common, obs-common-dataaccess, obs-message-common, obstation-dataplugin-common, ohd-common, ohd-common-database, ohd-request, parameter-common, persist-request, pgen-common, pgen-request, pirep-common, pirep-common-dataaccess, poessounding-common, pointdata-common, pointdata-request, pointset-common, preciprate-common, profiler-common, profiler-common-dataaccess, qc-common, qpf-common, radar-common, radar-dataplugin-common, radar-request, redbook-common, remotescript-request, request-service, request-service-common, rpgenvdata-request, satellite-common, satellite-dataplugin-common, satellite-request, scan-common, sfcobs-common, sfcobs-common-dataaccess, sgwh-common, sgwhv-common, shef-common, site-common, site-request, solarimage-common, soundingrequest-request, ssha-common, stats-common, stats-request, stormtrack-common, stq-common, svrwx-common, taf-common, tcg-common, tcm-common, tcs-common, text-common, text-dbsrv-common, text-dbsrv-request, text-request, text-subscription-common, text-subscription-request, time-common, topo-dataaccess-common, uengine-request, units-common, useradmin-common, useradmin-request, utility-common, utility-request, vaa-common, viirs-common, vil-common, warning-common, warning-common-dataaccess, warning-request, wcp-common

View file

@ -49,7 +49,6 @@ td:first-child { font-weight: bold }
| modis | NASA Moderate-resolution Imaging Spectroradiometer |
| ncpafm | NCEP Point/Area Forecast Matrices data |
| ncscat | NCEP ASCAT/Quikscat records |
| nctaf | NCEP Terminal Aerodrome Forecasts |
| nctext | NCEP Text decoders |
| ncuair | NCEP Upper Air decoder |
| ndm | National Dataset Maintenance ingester |

View file

@ -158,6 +158,5 @@ To see a list of the data plug-ins that have purge rules:
/awips2/edex/data/utility/common_static/base/purge/ghcdPurgeRules.xml
/awips2/edex/data/utility/common_static/base/purge/ntransPurgeRules.xml
/awips2/edex/data/utility/common_static/base/purge/regionalsatPurgeRules.xml
/awips2/edex/data/utility/common_static/base/purge/nctafPurgeRules.xml
/awips2/edex/data/utility/common_static/base/purge/solarimagePurgeRules.xml
/awips2/edex/data/utility/common_static/site/AFC/purge/regionalsatPurgeRules.xml

View file

@ -89,11 +89,6 @@
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetKnownOfficeTypesRequest"/>
<constructor-arg ref="knownOfficeTypesHandler"/>
</bean>
<bean id="iscSendStatusHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetIscSendStatusHandler"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest"/>
<constructor-arg ref="iscSendStatusHandler"/>
</bean>
<bean id="knownSitesHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetKnownSitesHandler"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetKnownSitesRequest"/>
@ -181,16 +176,6 @@
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.SaveGfeGridRequest"/>
<constructor-arg ref="saveGfeGridHandler"/>
</bean>
<bean id="sendIscGridHandler" class="com.raytheon.edex.plugin.gfe.server.handler.SendIscGridHandler"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.SendIscGridRequest"/>
<constructor-arg ref="sendIscGridHandler"/>
</bean>
<bean id="sendWFOMessageHandler" class="com.raytheon.edex.plugin.gfe.server.handler.SendWFOMessageHandler"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.SendWFOMessageRequest"/>
<constructor-arg ref="sendWFOMessageHandler"/>
</bean>
<bean id="singletonDbIdsHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetSingletonDbIdsRequestHandler"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetSingletonDbIdsRequest"/>
@ -245,29 +230,6 @@
<property name="provider" ref="brokerConnectionsProvider" />
</bean>
<!-- ISC Send Beans -->
<bean id="iscSendQueue" class="com.raytheon.edex.plugin.gfe.isc.IscSendQueue" factory-method="getInstance"/>
<bean id="sendIscSrv" class="com.raytheon.edex.plugin.gfe.isc.SendIscSrv" depends-on="gfeDbRegistered, gfeSitesActiveRequest">
<property name="runningTimeOutMillis" value="300000"/>
<property name="threadSleepInterval" value="5000"/>
</bean>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="gfe-request-camel"/>
<constructor-arg ref="sendIscSrv"/>
</bean>
<!-- End ISC Send Beans -->
<!-- ISC Receive Beans -->
<bean id="IscReceiveSrv" class="com.raytheon.edex.plugin.gfe.isc.IscReceiveSrv">
<constructor-arg ref="iscDataRecPythonThreadPool"/>
</bean>
<!-- End ISC Receive Beans -->
<!-- Additional ISC Beans -->
<bean id="ifpnetCDFFactory" class="com.raytheon.edex.plugin.gfe.isc.IscScriptFactory">
<constructor-arg value="ifpnetCDF"/>
</bean>
@ -315,7 +277,6 @@
<endpoint id="gfeLogPurgeCron" uri="clusteredquartz://gfe/purgeGfeLogs/?cron=${purge.gfe.logs.cron}"/>
<endpoint id="gfeProductIscPurgeCron" uri="clusteredquartz://gfe/purgeGfeProductsIsc/?cron=${purge.gfe.products.isc.cron}"/>
<endpoint id="gfeProductAtblPurgeCron" uri="clusteredquartz://gfe/purgeGfeProductsAtbl/?cron=${purge.gfe.products.atbl.cron}"/>
<endpoint id="iscSendLauncher" uri="quartz://iscSendThread?trigger.repeatCount=0&amp;trigger.repeatInterval=1"/>
<endpoint id="gfeClearOrphanedLocksCron" uri="clusteredquartz://gfe/clearGfeOrhpanedLocks/?cron=${clear.gfe.orphaned.locks.cron}"/>
<route id="exportDigitalData">
@ -385,54 +346,8 @@
</doCatch>
</doTry>
</route>
<!-- ISC Data Receive route -->
<route id="iscReceiveRoute">
<from uri="jms-durable:queue:gfeIscDataReceive?concurrentConsumers=2"/>
<doTry>
<pipeline>
<bean ref="serializationUtil" method="transformFromThrift"/>
<bean ref="IscReceiveSrv" method="processRequest"/>
</pipeline>
<doCatch>
<exception>java.lang.Throwable</exception>
<to uri="log:iscDataRec?level=ERROR"/>
</doCatch>
</doTry>
</route>
<!-- Thread runs for life of context -->
<route id="iscSendThread">
<from ref="iscSendLauncher"/>
<bean ref="sendIscSrv" method="run"/>
</route>
</camelContext>
<!-- ISC Send Routes -->
<camelContext id="clusteredGfeIscRoutes" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<route id="iscSendJobQueueAggr">
<from uri="jms-durable:queue:iscSendNotification" />
<doTry>
<bean ref="serializationUtil" method="transformFromThrift"/>
<bean ref="iscSendQueue" method="addSendJobs"/>
<doCatch>
<exception>java.lang.Throwable</exception>
<to uri="log:iscSendQueue?level=ERROR"/>
</doCatch>
</doTry>
</route>
<route id="iscSendTrigger">
<from uri="timer://iscSendTimer?fixedRate=true&amp;period=5000"/>
<bean ref="iscSendQueue" method="fireSendJobs"/>
</route>
</camelContext>
<bean factory-bean="contextManager" factory-method="registerClusteredContext">
<constructor-arg ref="clusteredGfeIscRoutes"/>
</bean>
<!-- ISC Services Beans -->
<bean id="iscProvider" class="com.raytheon.edex.plugin.gfe.isc.IscServiceProvider" />

View file

@ -2823,8 +2823,8 @@ D2DAccumulativeElements= {
#---------------------------------------------------------------------------
# base urls for the ISC Routing Table
ISC_ROUTING_TABLE_ADDRESS = {
"ANCF" : "http://svcbu-ancf.er.awips.noaa.gov:8080/irt",
"BNCF" : "http://svcbu-bncf.er.awips.noaa.gov:8080/irt"
"ANCF" : "http://localhost:8080/irt",
"BNCF" : "http://localhost:8080/irt"
}

View file

@ -132,7 +132,7 @@ SVCBU_DB=Official
SVCBU_TRIM_ELEMS=1
SVCBU_FAILED_SITE_PORT=98000001
SVCBU_GRIDAREA=ISC_Send_Area
SVCBU_ADDRESSEE="ANCF,BNCF"
SVCBU_ADDRESSEE="ANCF"
SVCBU_WMO_HEADER=SVCBKPIFP
SVCBU_USER=0

View file

@ -4,5 +4,4 @@ bin.includes = META-INF/,\
utility/,\
.,\
res/,\
resources/,\
WarningDecoder.py

View file

@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
res/
.

View file

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<requestPatterns xmlns:ns2="group">
<!--
This pattern excludes the current "prototype" WMO headers for future GOES-R data.
-->
<regex>TI[CGT]... ....</regex>
<regex>rad/NEXRCOMP</regex>
<regex>.*.gini.*</regex>
<regex>.*.gini</regex>
<regex>.*.gini.png</regex>
</requestPatterns>

112
rpms/unidata/cibuild.sh Executable file
View file

@ -0,0 +1,112 @@
#!/bin/bash
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 ...
path_to_script=`readlink -f $0`
dir=$(dirname $path_to_script)
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"
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
echo "BUILD_DIR = $BUILD_DIR"
echo "BUILD_WORKSPACE = $BUILD_WORKSPACE"
echo "BASELINE = $BASELINE"
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 baseline
pushd . > /dev/null 2>&1
cd ${BASELINE}
mkdir -p ${WORKSPACE}
RSYNC_DIRS=`cat $dir/rsync.dirs`
rsync -ruql --delete --exclude-from=${dir}/excludes ${RSYNC_DIRS} ${WORKSPACE}
popd > /dev/null 2>&1
# execute the build for the appropriate architecture
_rpms_build_directory=${WORKSPACE}/rpms/build
_architecture=`uname -i`
_build_sh_directory=${_rpms_build_directory}/${_architecture}
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}
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/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
fi
END_TIME=`date "+%s"`
TIME_SPENT=$((END_TIME - START_TIME))
TTI_HOURS=$((TIME_SPENT/3600))
TTI_SECS=$((TIME_SPENT %3600)) #Remaining seconds
TTI_MINS=$((TTI_SECS/60))
TTI_SECS=$((TTI_SECS%60))
echo "Total-time-Spent-In-The-Build-For $0 = $TTI_HOURS hours, $TTI_MINS minutes, $TTI_SECS seconds"
exit