update reference configs for tests

alan-turing-institute · Jul 15, 2024 · a39be31 · a39be31
1 parent 7cb8577
commit a39be31
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/tests/resources/sre_bluet1guac_full_config.json b/tests/resources/sre_bluet1guac_full_config.json
@@ -11,7 +11,7 @@
         }
       },
       "external_dns_resolver": "168.63.129.16",
-      "fqdn": "DC1-SHM-BLUE.blue.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc1-shm-blue.blue.develop.turingsafehaven.ac.uk",
       "hostname": "DC1-SHM-BLUE",
       "hostnameLower": "dc1-shm-blue",
       "hostnameUpper": "DC1-SHM-BLUE",
@@ -23,7 +23,7 @@
       "vmSize": "Standard_D2s_v3"
     },
     "dcb": {
-      "fqdn": "DC2-SHM-BLUE.blue.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc2-shm-blue.blue.develop.turingsafehaven.ac.uk",
       "hostname": "DC2-SHM-BLUE",
       "ip": "10.0.0.5",
       "vmName": "DC2-SHM-BLUE"
@@ -33,6 +33,8 @@
       "rg": "RG_SHM_DNS_TEST",
       "subscriptionName": "[Prod] Safe Haven Domains"
     },
+    "dockerAccount": "youraccountname",
+    "dockerPassword": "dckr_pat_0o0o0o0o0o0o0o0o0o0o0o0o0o0",
     "domain": {
       "dn": "DC=blue,DC=develop,DC=turingsafehaven,DC=ac,DC=uk",
       "fqdn": "blue.develop.turingsafehaven.ac.uk",
@@ -129,6 +131,9 @@
             "185.125.190.18",
             "185.125.190.36",
             "185.125.190.39",
+            "185.125.190.81",
+            "185.125.190.82",
+            "185.125.190.83",
             "103.21.244.0/22",
             "103.22.200.0/22",
             "103.31.4.0/22",
@@ -1221,7 +1226,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GUACAMOLE-SRE-T1GUAC.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "guacamole-sre-t1guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "GUACAMOLE-SRE-T1GUAC",
         "ip": "10.151.1.4",
         "vmName": "GUACAMOLE-SRE-T1GUAC",
@@ -1386,7 +1391,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "CODIMD.t1guac.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "codimd.t1guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "CODIMD",
         "ip": "10.151.5.6",
         "osVersion": "Ubuntu-latest",
@@ -1409,7 +1414,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GITLAB.t1guac.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "gitlab.t1guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "GITLAB",
         "ip": "10.151.5.5",
         "osVersion": "Ubuntu-latest",

diff --git a/tests/resources/sre_bluet3guac_full_config.json b/tests/resources/sre_bluet3guac_full_config.json
@@ -11,7 +11,7 @@
         }
       },
       "external_dns_resolver": "168.63.129.16",
-      "fqdn": "DC1-SHM-BLUE.blue.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc1-shm-blue.blue.develop.turingsafehaven.ac.uk",
       "hostname": "DC1-SHM-BLUE",
       "hostnameLower": "dc1-shm-blue",
       "hostnameUpper": "DC1-SHM-BLUE",
@@ -23,7 +23,7 @@
       "vmSize": "Standard_D2s_v3"
     },
     "dcb": {
-      "fqdn": "DC2-SHM-BLUE.blue.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc2-shm-blue.blue.develop.turingsafehaven.ac.uk",
       "hostname": "DC2-SHM-BLUE",
       "ip": "10.0.0.5",
       "vmName": "DC2-SHM-BLUE"
@@ -33,6 +33,8 @@
       "rg": "RG_SHM_DNS_TEST",
       "subscriptionName": "[Prod] Safe Haven Domains"
     },
+    "dockerAccount": "youraccountname",
+    "dockerPassword": "dckr_pat_0o0o0o0o0o0o0o0o0o0o0o0o0o0",
     "domain": {
       "dn": "DC=blue,DC=develop,DC=turingsafehaven,DC=ac,DC=uk",
       "fqdn": "blue.develop.turingsafehaven.ac.uk",
@@ -129,6 +131,9 @@
             "185.125.190.18",
             "185.125.190.36",
             "185.125.190.39",
+            "185.125.190.81",
+            "185.125.190.82",
+            "185.125.190.83",
             "103.21.244.0/22",
             "103.22.200.0/22",
             "103.31.4.0/22",
@@ -1221,7 +1226,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GUACAMOLE-SRE-T3GUAC.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "guacamole-sre-t3guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "GUACAMOLE-SRE-T3GUAC",
         "ip": "10.153.1.4",
         "vmName": "GUACAMOLE-SRE-T3GUAC",
@@ -1386,7 +1391,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "CODIMD.t3guac.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "codimd.t3guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "CODIMD",
         "ip": "10.153.5.6",
         "osVersion": "Ubuntu-latest",
@@ -1409,7 +1414,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GITLAB.t3guac.blue.develop.turingsafehaven.ac.uk",
+        "fqdn": "gitlab.t3guac.blue.develop.turingsafehaven.ac.uk",
         "hostname": "GITLAB",
         "ip": "10.153.5.5",
         "osVersion": "Ubuntu-latest",

diff --git a/tests/resources/sre_greent2guac_full_config.json b/tests/resources/sre_greent2guac_full_config.json
@@ -11,7 +11,7 @@
         }
       },
       "external_dns_resolver": "168.63.129.16",
-      "fqdn": "DC1-SHM-GREEN.green.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc1-shm-green.green.develop.turingsafehaven.ac.uk",
       "hostname": "DC1-SHM-GREEN",
       "hostnameLower": "dc1-shm-green",
       "hostnameUpper": "DC1-SHM-GREEN",
@@ -23,7 +23,7 @@
       "vmSize": "Standard_D2s_v3"
     },
     "dcb": {
-      "fqdn": "DC2-SHM-GREEN.green.develop.turingsafehaven.ac.uk",
+      "fqdn": "dc2-shm-green.green.develop.turingsafehaven.ac.uk",
       "hostname": "DC2-SHM-GREEN",
       "ip": "10.0.0.5",
       "vmName": "DC2-SHM-GREEN"
@@ -33,6 +33,8 @@
       "rg": "RG_SHM_DNS_TEST",
       "subscriptionName": "[Prod] Safe Haven Domains"
     },
+    "dockerAccount": "youraccountname",
+    "dockerPassword": "dckr_pat_0o0o0o0o0o0o0o0o0o0o0o0o0o0",
     "domain": {
       "dn": "DC=green,DC=develop,DC=turingsafehaven,DC=ac,DC=uk",
       "fqdn": "green.develop.turingsafehaven.ac.uk",
@@ -129,6 +131,9 @@
             "185.125.190.18",
             "185.125.190.36",
             "185.125.190.39",
+            "185.125.190.81",
+            "185.125.190.82",
+            "185.125.190.83",
             "103.21.244.0/22",
             "103.22.200.0/22",
             "103.31.4.0/22",
@@ -1274,7 +1279,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GUACAMOLE-SRE-T2GUAC.green.develop.turingsafehaven.ac.uk",
+        "fqdn": "guacamole-sre-t2guac.green.develop.turingsafehaven.ac.uk",
         "hostname": "GUACAMOLE-SRE-T2GUAC",
         "ip": "10.152.1.4",
         "vmName": "GUACAMOLE-SRE-T2GUAC",
@@ -1439,7 +1444,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "CODIMD.t2guac.green.develop.turingsafehaven.ac.uk",
+        "fqdn": "codimd.t2guac.green.develop.turingsafehaven.ac.uk",
         "hostname": "CODIMD",
         "ip": "10.152.5.6",
         "osVersion": "Ubuntu-latest",
@@ -1462,7 +1467,7 @@
             "type": "Standard_LRS"
           }
         },
-        "fqdn": "GITLAB.t2guac.green.develop.turingsafehaven.ac.uk",
+        "fqdn": "gitlab.t2guac.green.develop.turingsafehaven.ac.uk",
         "hostname": "GITLAB",
         "ip": "10.152.5.5",
         "osVersion": "Ubuntu-latest",