Merge remote-tracking branch 'interuss/main' into feature/action-gene…

…rator-documentation

.github/workflows/ci.yml

@@ -48,27 +48,25 @@ jobs:
         cd monitoring/mock_uss
         make test
 
-  uss_qualifier_F3411-22a-test:
-    name: uss_qualifier tests (F3411-22a configuration)
+  uss_qualifier-test:
+    name: uss_qualifier tests
     uses: ./.github/workflows/monitoring-test.yml
     with:
-      name: uss_qualifier_F3411-22a
+      name: uss_qualifier
       script: |
-        export RID_VERSION=F3411-22a \
-          CONFIG_NAME="" \
+        export CONFIG_NAME="" \
           USS_QUALIFIER_STOP_FAST=true
 
         cd monitoring/uss_qualifier
         make test
 
   uss_qualifier_F3411-19-test:
-    name: uss_qualifier tests (F3411-19 configuration)
+    name: uss_qualifier F3411-19 tests
     uses: ./.github/workflows/monitoring-test.yml
     with:
       name: uss_qualifier_F3411-19
       script: |
-        export RID_VERSION=F3411-19 \
-          CONFIG_NAME=configurations.dev.netrid_v19 \
+        export CONFIG_NAME=configurations.dev.netrid_v19 \
           USS_QUALIFIER_STOP_FAST=true
 
         cd monitoring/uss_qualifier

monitoring/atproxy/run_locally.sh

@@ -10,7 +10,10 @@ else
 fi
 cd "${BASEDIR}/../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 CLIENT_BASIC_AUTH="local_client:local_client"
 PUBLIC_KEY="/var/test-certs/auth2.pem"

monitoring/mock_uss/run_locally_msgsigning.sh

@@ -3,6 +3,7 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
   "${SCRIPT_DIR}/../build.sh" || exit 1
+  export DO_NOT_BUILD_MONITORING=true
 fi
 
 AUTH="DummyOAuth(http://host.docker.internal:8085/token,uss1)"

monitoring/mock_uss/run_locally_test_geoawareness.sh

@@ -3,6 +3,7 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
   "${SCRIPT_DIR}/../build.sh" || exit 1
+  export DO_NOT_BUILD_MONITORING=true
 fi
 
 PUBLIC_KEY="/var/test-certs/auth2.pem"

monitoring/uss_qualifier/bin/generate_rid_test_definition.sh

@@ -12,7 +12,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 CONFIG_LOCATION="monitoring/uss_qualifier/config_run_locally.json"
 CONFIG='--config config_run_locally.json'

monitoring/uss_qualifier/bin/run.sh

@@ -30,7 +30,10 @@ AUTH="${2:-NoAuth()}"
 
 QUALIFIER_OPTIONS="--auth $AUTH --config /config.json --report output/report.json"
 
-"$(pwd)"/monitoring/build.sh
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  "$(pwd)"/monitoring/build.sh
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 if [ "$CI" == "true" ]; then
   docker_args="--add-host host.docker.internal:host-gateway" # Required to reach other containers in Ubuntu (used for Github Actions)

monitoring/uss_qualifier/scripts/format_test_documentation.sh

@@ -13,7 +13,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 # shellcheck disable=SC2086
 docker run --name test_documentation_formatter \

monitoring/uss_qualifier/scripts/format_test_suite_docs.sh

@@ -13,7 +13,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 # shellcheck disable=SC2086
 docker run --name test_suite_docs_formatter \

monitoring/uss_qualifier/scripts/run_unit_tests.sh

@@ -13,7 +13,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 # shellcheck disable=SC2086
 docker run --name uss_qualifier_unit_test \

monitoring/uss_qualifier/scripts/test_docker_fully_mocked.sh

@@ -50,11 +50,9 @@ echo "============="
 make start-locally
 make start-uss-mocks
 
-RID_VERSION=${RID_VERSION:-"F3411-22a"}
 CONFIG_NAME=${CONFIG_NAME:-""}
 echo "Selecting configuration"
 echo "============="
-echo "RID_VERSION: $RID_VERSION"
 echo "CONFIG_NAME: $CONFIG_NAME"
 
 

monitoring/uss_qualifier/scripts/validate_test_definitions.sh

@@ -13,7 +13,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 # shellcheck disable=SC2086
 docker run --name test_definition_validator \

monitoring/uss_qualifier/webapp/run_locally.sh

@@ -10,7 +10,10 @@ else
 fi
 cd "${BASEDIR}/../../.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 # Run monitoring/mock_uss/run_locally_ridsp.sh and
 # monitoring/mock_uss/run_locally_riddp.sh to produce a mock RID system

schemas/manage_type_schemas.sh

@@ -13,7 +13,10 @@ else
 fi
 cd "${BASEDIR}/.." || exit 1
 
-monitoring/build.sh || exit 1
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  monitoring/build.sh || exit 1
+  export DO_NOT_BUILD_MONITORING=true
+fi
 
 action=${1:?The action must be specified as --check or --generate}