94a2d41644d235ec3702d8189ec52036e739000a
Merge parents f7d5770 b5ba1cd
markd
  Sun Feb 28 14:23:10 2021 -0800
merge master into branch

diff --cc src/hg/makeDb/trackDb/makefile
index 5d8f98f,d65ecc0..7c480b7
--- src/hg/makeDb/trackDb/makefile
+++ src/hg/makeDb/trackDb/makefile
@@@ -234,69 -234,56 +234,73 @@@
  	${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
 +	HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -remoteLogin=${BETA_MACHINE} -release=beta trackDb_betaTest hgFindSpec_betaTest $*
 +
  %_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  -f $*.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:
 +	HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks ${EXTRA} -strict -remoteLogin=${PUBLIC_MACHINE} -release=public trackDb_publicTest hgFindSpecTest_publicTest $*
 +
  %_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 hgFindSpec_public $*
+ 	rm -f $*.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: