Add the round robin stuff to the mirrors.lua, and jiggle the code that loops through mirrors.

2 files changed, 11 insertions, 10 deletions

diff --git a/README.md b/README.md
index 8839e63..5ac7f9b 100644
--- a/README.md
+++ b/README.md
@@ -195,12 +195,10 @@ table.  Add the round robin domain name.  Resolve all the IPs and add
 them to this table.  Write this table to results/mirrors.lua so that the
 forked tests can read it.
 
-Remove the mirror site from the mirrors table, then checkHost() it
-first.
+checkHost() the referenece site first.
 
-checkHost() deb.devuan.org, the DNS RR.
-
-Loop through the mirrors table, and checkHost() each one.
+Loop through the mirrors table, and checkHost() each one, skipping the
+reference site.
 
 Wait for all forked tests to finish.
 
diff --git a/mirror-checker.lua b/mirror-checker.lua
index 6580190..3da8bc6 100755
--- a/mirror-checker.lua
+++ b/mirror-checker.lua
@@ -443,6 +443,9 @@ local getMirrors = function ()
             mirrors[host] = m
         end
     end
+    mirrors[options.roundRobin.value] = { ["Protocols"] = { ["http"] = true; ["https"] = true; };  ["FQDN"] = 'deb.devuan.org'; ["Active"] = 'yes'; ["BaseURL"] = 'deb.devuan.org'; }
+    gatherIPs(options.roundRobin.value)
+    mirrors[options.roundRobin.value].IPs = IP[options.roundRobin.value]
     local file, e = io.open("results/mirrors.lua", "w+")
     if nil == file then C("opening mirrors file - " .. e) else
         file:write(dumpTable(mirrors, "", "mirrors") .. "\nreturn mirrors\n")
@@ -575,9 +578,7 @@ else
     I("Starting tests " .. table.concat(options.tests.value, ", "))
     execute("mkdir -p results")
     mirrors = getMirrors()
-    mirrors[options.referenceSite.value] = nil
     checkHost(options.referenceSite.value)
-    checkHost("deb.devuan.org")
     for k, m in pairs(mirrors) do
         if "/" == m.BaseURL:sub(-1, -1) then
             W("slash at end of BaseURL in mirror_list.txt!  " .. m.BaseURL)
@@ -588,9 +589,11 @@ else
             m.BaseURL = m.BaseURL:sub(1, -2)
         end
         local pu = url.parse("http://" .. m.BaseURL)
-        checkHost(m.BaseURL)
-        checkExes("mirror-checker.lua " .. sendArgs)
-        if testing("Integrity") or testing("Updated") then checkExes(downloadLock) end
+        if options.referenceSite.value ~= pu.host then
+            checkHost(m.BaseURL)
+            checkExes("mirror-checker.lua " .. sendArgs)
+            if testing("Integrity") or testing("Updated") then checkExes(downloadLock) end
+        end
     end
     while 1 <= checkExes("mirror-checker.lua " .. sendArgs) do os.execute("sleep 10") end
     if testing("Integrity") or testing("Updated") then