7528b6b68b9162fb9c69b2ffb43fde8eea9e3a35 braney Thu Jan 28 17:51:12 2021 -0800 check the RR or beta for the presence of bigDataUrl referenced files before adding them to trackDb. diff --git src/hg/makeDb/trackDb/makefile src/hg/makeDb/trackDb/makefile index 25f7727..02381b2 100644 --- src/hg/makeDb/trackDb/makefile +++ src/hg/makeDb/trackDb/makefile @@ -234,79 +234,56 @@ ${MAKE} alpha_all alpha_all: ${DBS:%=%_alpha} %_alpha: ./loadTracks ${EXTRA} -release=alpha trackDb hgFindSpec $* ./checkMetaDb alpha metaDb $* rm -f ${HIVE_TRIX}/$*_trackDb.{ixx,ix}} HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/alpha/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} $* ./makeTrixLinks trackDb ${HIVE_TRIX} $* # now build the relatedTracks table for each db ./buildRelatedTracks relatedTrack $* onbeta: /cluster/home/${USER}/.hg.conf.beta -betaTest: onbeta clean - ${MAKE} betaTest_all - -betaTest_all: ${DBS:%=%_betaTest} - beta: onbeta clean ${GIT} pull ${MAKE} beta_all beta_all: ${DBS:%=%_beta} -%_betaTest: - # now do loads on hgwbeta - ssh ${BETA_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=beta trackDb_betaTest hgFindSpec_betaTest $* - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta hgsql $* -Ne "select tableName from trackDb" | sort > $*.tableList.txt - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta hgsql $* -Ne "select tableName from trackDb_betaTest" | sort > $*.tableListTest.txt - -diff $*.tableList.txt $*.tableListTest.txt - rm $*.gbdbList.txt $*.tableList.txt $*.tableListTest.txt - %_beta: # now do loads on hgwbeta - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -release=beta trackDb hgFindSpec $* + ssh ${BETA_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt + HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=beta trackDb hgFindSpec $* + rm $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./checkMetaDb beta metaDb $* HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/beta/cv.ra ${BETA_MACHINE} ${DATA_TRIX} $* # now make files for hgwdev-beta (we share the tables with hgwbeta) HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/beta/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} $* -publicTest: onbeta clean - ${MAKE} publicTest_all - -publicTest_all: ${DBS:%=%_publicTest} - public: onbeta clean ${GIT} pull ${MAKE} public_all public_all: ${DBS:%=%_public} -%_publicTest: - ssh ${PUBLIC_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=public trackDb_publicTest hgFindSpecTest_publicTest $* - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta hgsql $* -Ne "select tableName from trackDb_public" | sort > $*.tableList.txt - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta hgsql $* -Ne "select tableName from trackDb_publicTest" | sort > $*.tableListTest.txt - -diff $*.tableList.txt $*.tableListTest.txt - rm $*.gbdbList.txt $*.tableList.txt $*.tableListTest.txt - %_public: - HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -release=public trackDb_public hgFindSpec_public $* + ssh ${PUBLIC_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt + HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=public trackDb_public hgFindSpecTest_public $* + rm $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./checkMetaDb public metaDb_public $* HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb_public ${BUILD_TRIX} trackDb_public metaDb_public cv/public/cv.ra ${BETA_MACHINE} ${DATA_TRIX} $* # this will fail if we are not in a beta checkout: checkbeta: ${GIT} branch | egrep '^[*] v[0-9]+_branch' > /dev/null # not sure if anyone actually uses the target below. It used to be "beta". buildBeta: checkbeta clean strict encodeReport: ${GIT} pull ./loadTracks ${EXTRA} trackDb_encodeReport hgFindSpec ${DBS} listDbs: