bd0a18827dcd91e4fae812f795e2a39968535627 braney Thu Jan 21 16:52:04 2021 -0800 when building beta or public, check on hgwbeta and hgw0 for files referenced by bigDataUrl rather than assuming that they exist if they exist on dev diff --git src/hg/makeDb/trackDb/makefile src/hg/makeDb/trackDb/makefile index c33b9e4..5d8f98f 100644 --- src/hg/makeDb/trackDb/makefile +++ src/hg/makeDb/trackDb/makefile @@ -196,30 +196,31 @@ ARCHIVED_DBS = \ rheMac1 \ danRer1 \ mm5 \ mm6 \ danRer2 # if trix build breaks, disable by setting to /bin/true instead of ./buildTrix # BUILD_TRIX = /bin/true BUILD_TRIX = ./buildTrix HIVE_TRIX = /hive/data/inside/trix DATA_TRIX = /data/trix ALPHA_MACHINE = hgwdev.gi.ucsc.edu BETA_MACHINE = qateam@hgwbeta.soe.ucsc.edu +PUBLIC_MACHINE = qateam@hgw0.soe.ucsc.edu # For the new demo-$USER machines, the "USER" passed in to makefile contains a hyphen which # needs to be replaced with an underscore for mysql table names. USERTABLE = $(shell echo ${USER} | sed -e 's/-/_/g') update: ${DBS:%=%_update} ${MKDIR} ${CGI_BIN}-${USER}/encode %_update: ./loadTracks ${EXTRA} trackDb_${USERTABLE} hgFindSpec_${USERTABLE} $* ./checkMetaDb alpha metaDb_${USERTABLE} $* # now build the relatedTracks table for each db ./buildRelatedTracks relatedTrack_${USERTABLE} $* # if you want to test track search tool with your own trix file # rm -f ${DBS:%=${HIVE_TRIX}/%_trackDb_${USERTABLE}.{ixx,ix}} @@ -233,50 +234,67 @@ ${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 $* 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 $* 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}