91cecec4e65aa52dfa528d17a1fba9e1b7672381
lrnassar
  Tue Jun 4 13:41:15 2019 -0700
Updating scripts to point to new beta machine #23616

diff --git src/utils/qa/copyHgcentral src/utils/qa/copyHgcentral
index 3b5369c..8b5723c 100755
--- src/utils/qa/copyHgcentral
+++ src/utils/qa/copyHgcentral
@@ -99,31 +99,31 @@
         print dbDbList[diffList[i]], "=", dbDb1[diffList[i]]
     print "\n" + dbDbDest + ":"
     for i in range(0,len(diffList)):
         print dbDbList[diffList[i]], "=", dbDb2[diffList[i]]
     print
 
 
 def runTest(testOptions, testTable, testField1, testField2, testOrder):
     """This function handles the running of test mode.  In test mode, all three
        servers are queried and tested for special cases.  The state of all three
        servers and any relevant error messages are output."""
     fileDev, fileBeta, fileRr = getFilename(testTable, testOptions.assembly)
     testQuery = "select * from " + testTable + " where " + testField1 + "=\"" + \
                  testField2 + "\" order by " + testOrder
     queryDev = createFile(fileDev, "hgcentraltest", testQuery, "hgwdev")
-    queryBeta = createFile(fileBeta, "hgcentralbeta", testQuery, "mysqlbeta")
+    queryBeta = createFile(fileBeta, "hgcentralbeta", testQuery, "hgwbeta")
     queryRr = createFile(fileRr, "hgcentral", testQuery, "genome-centdb")
     if queryDev == "" and queryBeta == "" and queryRr == "":
         printHeader(testTable)
         print "*** There is no", testTable, "data for", testOptions.assembly + ".  Check to make " \
               "sure you typed the\nassembly name properly. ***\n\n"
         return
     printOutput(testTable, queryDev, queryBeta, queryRr)
     if queryDev != queryBeta:
         print "*** There are", testTable, "differences between dev and beta ***"
         if testTable == "dbDb" and queryDev != "" and queryBeta != "":
             parseDbDb("dev", "beta", testOptions.assembly)
         else:
             print
     else:
         print "*** The", testTable, "data on dev and beta is identical ***\n"
@@ -154,93 +154,93 @@
     cladeBetaQuery = "select distinct(clade) from genomeClade order by clade"
     deleteQuery = "delete from " + execTable + " where " + execField1 + "=\"" + execField2 + "\""
     loadQueryBeta = "load data local infile '" + fileTestDev + "' into table " + execTable
     loadQueryRr = "load data local infile '" + fileTestBeta + "' into table " + execTable
     activeZeroQuery = "update dbDb set active=0 where name=\"" + execField2 + "\""
     if not os.path.isfile(fileTestDev) or not os.path.isfile(fileTestBeta) or not \
             os.path.isfile(fileTestRr):
         printHeader(execTable)
         print "*** Test mode must be run before execute mode.  If test mode was already " \
               "run, it is\npossible that one of the output files was deleted.  Please " \
               "re-run test mode. ***\n\n"
         return
     queryTestDev = openFile(fileTestDev)
     queryExecuteDev = chopper(callHgsql("hgcentraltest", execQuery, "hgwdev"), "strip", "")
     queryTestBeta = openFile(fileTestBeta)
-    queryExecuteBeta = chopper(callHgsql("hgcentralbeta", execQuery, "mysqlbeta"), "strip", "")
+    queryExecuteBeta = chopper(callHgsql("hgcentralbeta", execQuery, "hgwbeta"), "strip", "")
     queryTestRr = openFile(fileTestRr)
     queryExecuteRr = chopper(callHgsql("hgcentral", execQuery, "genome-centdb"), "strip", "")
     if queryTestDev != queryExecuteDev or queryTestBeta != queryExecuteBeta or \
             queryTestRr != queryExecuteRr:
         printHeader(execTable)
         print "*** The", execTable, "data has changed since test mode was run.  " \
               "Please re-run test mode. ***\n\n"
         return
     if execOptions.orig == "dev":
         queryExecuteOrig = queryExecuteDev
         queryExecuteDest = queryExecuteBeta
     else:
         queryExecuteOrig = queryExecuteBeta
         queryExecuteDest = queryExecuteRr
     if queryExecuteOrig == "":
         printOutput(execTable, queryExecuteDev, queryExecuteBeta, queryExecuteRr)
         print "\n*** There is no", execTable, "data on", execOptions.orig, \
               "to be copied ***\n\n"
         return
     if queryExecuteOrig == queryExecuteDest:
         printOutput(execTable, queryExecuteDev, queryExecuteBeta, queryExecuteRr)
         print "\n*** The", execTable, "data on", execOptions.orig, "and", \
               execOptions.dest, "is identical.  Nothing was copied. ***\n\n"
         return
     eraseFirst = 0
     clade = ""
     cladesBeta = ""
     if execTable == "genomeClade":
         clade = chopper(callHgsql("hgcentraltest", cladeQuery, "hgwdev"), "strip", "")
-        cladesBeta = chopper(callHgsql("hgcentralbeta", cladeBetaQuery, "mysqlbeta"), "split", "\n")
+        cladesBeta = chopper(callHgsql("hgcentralbeta", cladeBetaQuery, "hgwbeta"), "split", "\n")
     if execOptions.orig == "dev" and execTable == "genomeClade" and \
             queryExecuteBeta == "" and clade not in cladesBeta:
         printOutput(execTable, queryExecuteDev, queryExecuteBeta, queryExecuteRr)
         print "*** Copying aborted.  The", clade, "clade exists only on " \
               "dev.  Please consult with the\nappropriate engineer to find " \
               "the correct clade and priority value for", execOptions.assembly, \
               "and\nmanually add this entry to the proper clade on beta. ***\n\n"
         return
     if queryExecuteDest != "":
         input = ""
         print
         while input not in ["yes", "no"]:
             input = raw_input("The existing " + execTable + " data on " +
                               execOptions.dest + " differs from the " +
                               execTable + " data on " + execOptions.orig +
                               ".  If you proceed,\nthis data will be overwritten.  "
                               "Are you sure you wish to proceed? (yes/no): ");
             if input not in ["yes", "no"]:
                 print "\n*** Please respond with 'yes' or 'no' ***\n"
         if input == "yes":
             eraseFirst = 1
             print
         else:
             print
             printOutput(execTable, queryExecuteDev, queryExecuteBeta, queryExecuteRr)
             print "*** Copying aborted for", execTable, "***\n\n"
             return
     if execOptions.dest == "beta":
         if eraseFirst == 1:
-            callHgsql("hgcentralbeta", deleteQuery, "mysqlbeta")
-        callHgsql("hgcentralbeta", loadQueryBeta, "mysqlbeta")
-        queryExecuteBeta = chopper(callHgsql("hgcentralbeta", execQuery, "mysqlbeta"), "strip", "")
+            callHgsql("hgcentralbeta", deleteQuery, "hgwbeta")
+        callHgsql("hgcentralbeta", loadQueryBeta, "hgwbeta")
+        queryExecuteBeta = chopper(callHgsql("hgcentralbeta", execQuery, "hgwbeta"), "strip", "")
     else:
         if eraseFirst == 1:
             callHgsql("hgcentral", deleteQuery, "genome-centdb")
         callHgsql("hgcentral", loadQueryRr, "genome-centdb")
         if execTable == "dbDb":
             callHgsql("hgcentral", activeZeroQuery, "genome-centdb")
         queryExecuteRr = chopper(callHgsql("hgcentral", execQuery, "genome-centdb"), "strip", "")
     printOutput(execTable, queryExecuteDev, queryExecuteBeta, queryExecuteRr)
     print "***", execTable, "successfully copied from", execOptions.orig, "to", \
           execOptions.dest, "***\n"
     if execOptions.dest == "rr" and execTable == "dbDb":
         print "*** active set to 0 on rr ***\n"
     print