Merge branch 'loadgen-5hs-tests' into multi-server-tests

Author: marc-casavant

.github/workflows/ci-multi-server-tests.yml

@@ -2,10 +2,11 @@ name: Multi-Server CI Tests
 
 on:
   push:
-    branches: [ "loadgen-5hs-tests" ]
-
+    branches-ignore:
+      - coverity_scan
+      - run-fuzzer**
+      - debug-fuzzer-**
   pull_request:
-    branches: [ "loadgen-5hs-tests" ]
     paths:
       - '.github/workflows/ci-multi-server-tests.yml'
       - 'src/tests/multi-server/**'
@@ -15,8 +16,8 @@ jobs:
   pre-test:
     runs-on: ubuntu-latest
     outputs:
-      selfhosted: 0
-      #selfhosted: ${{ github.repository_owner == 'FreeRADIUS' && '1' || '0' }}
+      #selfhosted: 0
+      selfhosted: ${{ (github.repository_owner == 'FreeRADIUS') && '1' || '0' }}
     steps:
       - run: echo "Pre-test job; checking if using self-hosted runners"
 
@@ -84,10 +85,10 @@ jobs:
       - name: Get pre-built Docker image for self-hosted runner test
         if: ${{ needs.pre-test.outputs.selfhosted == '1' }}
         run: |
-          docker pull docker.internal.networkradius.com/self-hosted-${MULTI_SERVER_ENV_DOCKER_BUILD_OS}:latest
+          docker pull docker.internal.networkradius.com/self-hosted
 
           # Tag freeradius build image using using a non-OS specific name to be used with the multi-server docker compose environment.
-          docker tag docker.internal.networkradius.com/self-hosted-${MULTI_SERVER_ENV_DOCKER_BUILD_OS}:latest freeradius-build:latest
+          docker tag docker.internal.networkradius.com/self-hosted freeradius-build:latest
 
       - name: Run test-5hs-autoaccept test
         if: ${{ needs.pre-test.outputs.selfhosted != '1' }}
@@ -145,3 +146,29 @@ jobs:
             echo "TEST FAILED: No Matched line found with equal non-zero counts"
             exit 1
           fi
+
+      #
+      #  If the CI has failed and the branch is loadgen-5hs-tests then we start a tmate
+      #  session to provide interactive shell access to the session.
+      #
+      #  The SSH rendezvous point will be emited continuously in the job output,
+      #  which will look something like:
+      #
+      #      SSH: ssh VfuX8SrNuU5pGPMyZcz7TpJTa@sfo2.tmate.io
+      #
+      #  For example:
+      #
+      #      git push origin loadgen-5hs-tests --force
+      #
+      #  Look at the job output in: https://github.com/FreeRADIUS/freeradius-server/actions
+      #
+      #      ssh VfuX8SrNuU5pGPMyZcz7TpJTa@sfo2.tmate.io
+      #
+      #  Access requires that you have the private key corresponding to the
+      #  public key of the GitHub user that initiated the job.
+      #
+      - name: "Debug: Start tmate"
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: true
+        if: ${{ github.ref == 'refs/heads/loadgen-5hs-tests' && failure() }}

src/tests/multi-server/environments/configs/freeradius/load-generator/radiusd.conf.j2

@@ -40,11 +40,11 @@ modules {
 	{% include "environments/configs/freeradius/common/mods-available/stats" %}
 
 	# radius module instance configuration
-	{% for i in range(1, (load_gen_num_of_dest_servers + 1)) %}
-	radius radius-module-dest-server{{ i }} {
-		$template radius-module-dest-server-tmpl
+	{% for i in range(1, (load_gen_num_of_dst_servers + 1)) %}
+	radius radius-module-dst-server{{ i }} {
+		$template radius-module-dst-server-tmpl
 		udp {
-			ipaddr = {{ load_gen_dest_server_name }}{{ i }}
+			ipaddr = {{ load_gen_dst_server_name }}{{ i }}
 		}
 	}
 	{% endfor %}
@@ -183,8 +183,8 @@ server load-generator {
 	authenticate load-generator-proxy {
 		# Use redundant-load-balance to distribute requests to multiple home servers
 		redundant-load-balance {
-			{% for i in range(1, (load_gen_num_of_dest_servers + 1)) %}
-			radius-module-dest-server{{ i }}
+			{% for i in range(1, (load_gen_num_of_dst_servers + 1)) %}
+			radius-module-dst-server{{ i }}
 			{% endfor %}
 		}
 	}

src/tests/multi-server/environments/configs/freeradius/load-generator/template.d/load-generator-templates

@@ -2,7 +2,7 @@
 #
 # radius module template for load-generator
 #
-radius-module-dest-server-tmpl {
+radius-module-dst-server-tmpl {
 	mode = client
 	transport = udp
 	type = Access-Request

src/tests/multi-server/environments/jinja-vars/env-5hs-autoaccept.vars.yml

@@ -1,7 +1,7 @@
 # Docker compose Jinja template vars
 compose_num_of_home_servers: 5
 # Load generator Jinja template vars
-load_gen_num_of_dest_servers: 5
-load_gen_dest_server_name: homeserver
+load_gen_num_of_dst_servers: 5
+load_gen_dst_server_name: homeserver
 # General Jinja template vars
 listener_type: file