fix dd test run path & mqtt3 ci

Author: xiazhvera

.github/workflows/ci.yml

@@ -352,21 +352,11 @@ jobs:
         with:
           role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: run Fleet Provisioning service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt3_fleet_provisioning_cfg.json --thing-name-prefix Fleet_Thing_
       - name: run Fleet Provisioning service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
           export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
           python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt5_fleet_provisioning_cfg.json --thing-name-prefix Fleet_Thing_
-      - name: run Fleet Provisioning with CSR service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt3_fleet_provisioning_with_csr_cfg.json --thing-name-prefix Fleet_Thing_
       - name: run Fleet Provisioning with CSR service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
@@ -377,11 +367,6 @@ jobs:
         with:
           role-to-assume: ${{ env.CI_JOBS_SERVICE_CLIENT_ROLE }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: run mqtt3 Jobs serviceTests
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_jobs_execution.py --config-file ${{ env.CI_SERVICE_TESTS_CFG_FOLDER }}/mqtt3_jobs_cfg.json
       - name: run mqtt5 Jobs serviceTests
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
@@ -397,16 +382,6 @@ jobs:
         run: |
           export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
           python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt5_shadow_cfg.json
-      - name: run Shadow service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt3_shadow_cfg.json
-      - name: run Named Shadow service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt3_named_shadow_cfg.json
       - name: run Named Shadow service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
@@ -488,21 +463,11 @@ jobs:
         with:
           role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: run Fleet Provisioning service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt3_fleet_provisioning_cfg.json --thing-name-prefix Fleet_Thing_
       - name: run Fleet Provisioning service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
           export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
           python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt5_fleet_provisioning_cfg.json --thing-name-prefix Fleet_Thing_
-      - name: run Fleet Provisioning with CSR service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_fleet_provisioning.py --config-file test_cases/mqtt3_fleet_provisioning_with_csr_cfg.json --thing-name-prefix Fleet_Thing_
       - name: run Fleet Provisioning with CSR service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
@@ -513,11 +478,6 @@ jobs:
         with:
           role-to-assume: ${{ env.CI_JOBS_SERVICE_CLIENT_ROLE }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: run mqtt3 Jobs serviceTests
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_jobs_execution.py --config-file ${{ env.CI_SERVICE_TESTS_CFG_FOLDER }}/mqtt3_jobs_cfg.json
       - name: run mqtt5 Jobs serviceTests
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |
@@ -533,16 +493,6 @@ jobs:
         run: |
           export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
           python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt5_shadow_cfg.json
-      - name: run Shadow service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt3_shadow_cfg.json
-      - name: run Named Shadow service client test for MQTT311
-        working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-cpp-v2/utils
-          python3 ./test_cases/test_shadow_update.py --config-file test_cases/mqtt3_named_shadow_cfg.json
       - name: run Named Shadow service client test for MQTT5
         working-directory: ./aws-iot-device-sdk-cpp-v2/servicetests
         run: |

devicedefender/script/DDTestRun.py

@@ -43,10 +43,6 @@ def delete_thing_with_certi(thingName, certiId, certiArn):
 thing_arn = None
 client_made_thing = False
 client_made_policy = False
-use_mqtt5 = False
-if len(sys.argv) > 1:
-    use_mqtt5 = (sys.argv[1] == "mqtt5")
-    print("Run Device Defender with Mqtt5 Client")
 
 ##############################################
 # create a test thing
@@ -227,14 +223,13 @@ def delete_thing_with_certi(thingName, certiId, certiArn):
 
     print("[Device Defender]Info: Running sample (this should take ~60 seconds).")
 
-    if use_mqtt5:
-        # Run the sample:
-        exe_path = "build/samples/others/device_defender/mqtt5_basic_report/"
-        # If running locally, comment out the line above and uncomment the line below:
-        #exe_path = "samples/others/device_defender/basic_report/build/"
+    # Run the sample:
+    exe_path = "build/samples/others/device_defender/mqtt5_basic_report/"
+    # If running locally, comment out the line above and uncomment the line below:
+    #exe_path = "samples/others/device_defender/mqtt5_basic_report/build/"
 
-        # Windows has a different build folder structure, but this ONLY runs on Linux currently so we do not need to worry about it
-        exe_path = os.path.join(exe_path, "mqtt5-basic-report")
+    # Windows has a different build folder structure, but this ONLY runs on Linux currently so we do not need to worry about it
+    exe_path = os.path.join(exe_path, "mqtt5-basic-report")
 
     print("[Device Defender]Info: Start to run: " + exe_path)
     # The Device Defender sample will take ~1 minute to run even if successful