rolling up main to beta 2026-04-01

.github/workflows/jenkins-driver-tests.yml

@@ -0,0 +1,44 @@
+name: Run Jenkins driver tests
+on:
+  pull_request:
+    paths:
+      - 'drivers/**'
+
+jobs:
+  trigger-driver-test:
+    strategy:
+      matrix:
+        version:
+          [ 60 ]
+
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Create Commit Status (Pending)
+        id: status
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        with:
+          script: |
+            core.setOutput('status_url', (await github.rest.repos.createCommitStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: context.sha,
+              state: 'pending',
+              description: 'Jenkins job triggered...',
+              context: 'Driver Tests (${{ matrix.version }})'
+            })).data.url);
+      - name: Trigger Jenkins Generic Webhook
+        env:
+          JENKINS_WEBHOOK_TOKEN: ${{ secrets.JENKINS_WEBHOOK_TOKEN }}
+          JENKINS_WEBHOOK_URL: ${{ secrets.JENKINS_WEBHOOK_URL }}
+          STATUS_URL: ${{ steps.status.outputs.status_url }}
+        run: |
+          set +x
+          curl -s -o /dev/null -X POST \
+            -H "Content-Type: application/json" \
+            -H "Authorization: Bearer ${JENKINS_WEBHOOK_TOKEN}" \
+            -d "{\"status_url\": \"$STATUS_URL\",
+              \"version\": ${{ matrix.version }},
+              \"commit\": ${{ github.event.pull_request.head.sha }} }" \
+            "${JENKINS_WEBHOOK_URL}"
+          set -x

.github/workflows/run-tests.yml

@@ -39,51 +39,10 @@ jobs:
         id: cache_key
         run: echo "CACHE_KEY=${{ steps.lib-version.outputs.url }}-v1" >> $GITHUB_OUTPUT
 
-  get-dev-artifact:
-    runs-on: ubuntu-latest
-    outputs:
-      cache_key: ${{ steps.cache_key.outputs.CACHE_KEY }}
-    if: ${{ contains(join(github.event.pull_request.labels.*.name), 'release-') && github.event.pull_request.head.repo.fork != 'true' }}
-    steps:
-      - name: Get the version from the label
-        id: label-version
-        run: |
-          echo "${{ join(github.event.pull_request.labels.*.name) }}" | grep -oP "release-\d+.\d+" | xargs > out
-          echo "LIBRARY_VERSION=$(cat out)" >> $GITHUB_OUTPUT
-          mkdir /home/runner/work/lua_libs
-      - name: Find latest artifact
-        id: latest
-        env:
-          ARTIFACTORY_URL: ${{ format('https://smartthings.jfrog.io/artifactory/edge-driver-libs/{0}/', steps.label-version.outputs.LIBRARY_VERSION) }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: |
-          wget --user=$ARTIFACTORY_USERNAME --password=$ARTIFACTORY_PASSWORD $ARTIFACTORY_URL -q -O - | grep '.zip' | awk -F' ' '{print $3"-"$4"\t"$2}' | sort -t - -k3n -k2M -k1n -k4n | tail -1 | grep -o 'lua_libs_[a-z0-9_]*.zip' | head -1 > out
-          echo "ZIP_FILE=$(cat out)" >> $GITHUB_OUTPUT
-      - name: Try to retrieve cache
-        id: cached-libs
-        uses: actions/cache@v3
-        with:
-          path: '/home/runner/work/lua_libs'
-          key: ${{ steps.latest.outputs.ZIP_FILE }}-v1
-      - name: Download and unpack specified version
-        if: steps.cached-libs.outputs.cache-hit != 'true'
-        env:
-          ARTIFACTORY_URL: ${{ format('https://smartthings.jfrog.io/artifactory/edge-driver-libs/{0}/{1}', steps.label-version.outputs.LIBRARY_VERSION, steps.latest.outputs.ZIP_FILE) }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        working-directory: '/home/runner/work/lua_libs'
-        run: |
-          wget --user=$ARTIFACTORY_USERNAME --password=$ARTIFACTORY_PASSWORD $ARTIFACTORY_URL -O lua_libs.zip
-          unzip lua_libs.zip
-      - name: Set output
-        id: cache_key
-        run: echo "CACHE_KEY=${{ steps.latest.outputs.ZIP_FILE }}-v1" >> $GITHUB_OUTPUT
-
   run-driver-tests:
     runs-on: ubuntu-latest
     needs:
-      [ get-latest-release-artifact, get-dev-artifact ]
+      [ get-latest-release-artifact ]
     if: ${{ always() && contains(needs.*.result, 'success') && !contains(needs.*.result, 'failure') }}
     steps:
       - name: Set cache key

drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua

@@ -89,7 +89,10 @@ test.register_coroutine_test(
     local component_to_endpoint_map = mock_device:get_field("__component_to_endpoint_map")
     assert(component_to_endpoint_map["cookSurfaceOne"] == COOK_SURFACE_ONE_ENDPOINT, "Cook Surface One Endpoint must be 2")
     assert(component_to_endpoint_map["cookSurfaceTwo"] == COOK_SURFACE_TWO_ENDPOINT, "Cook Surface Two Endpoint must be 3")
-  end
+  end,
+  {
+     min_api_version = 19
+  }
 )
 
 test.register_message_test(
@@ -112,6 +115,9 @@ test.register_message_test(
         clusters.OnOff.server.commands.Off(mock_device, COOK_TOP_ENDPOINT)
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -149,6 +155,9 @@ test.register_message_test(
         clusters.TemperatureControl.server.commands.SetTemperature(mock_device, COOK_SURFACE_TWO_ENDPOINT, nil, 0) --0 is the index where Level1 is stored.
       }
     },
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -181,6 +190,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("cookSurfaceTwo", capabilities.temperatureMeasurement.temperature({ value = 20.0, unit = "C" }))
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 

drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua

@@ -101,6 +101,9 @@ test.register_message_test(
         clusters.OnOff.server.commands.Off(mock_device, APPLICATION_ENDPOINT)
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -166,6 +169,9 @@ test.register_message_test(
           }))
       }
     }, -- on receiving NO ERROR we don't do anything.
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -231,6 +237,9 @@ test.register_message_test(
           }))
       }
     }, -- on receiving NO ERROR we don't do anything.
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -296,6 +305,9 @@ test.register_message_test(
           }))
       }
     }, -- on receiving NO ERROR we don't do anything.
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -372,6 +384,9 @@ test.register_message_test(
           }))
       }
     }, -- on receiving NO ERROR we don't do anything.
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -433,6 +448,9 @@ test.register_message_test(
         clusters.DishwasherMode.server.commands.ChangeToMode(mock_device, APPLICATION_ENDPOINT, 1) --1 is the index where Super Dry is stored.
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -470,6 +488,9 @@ test.register_message_test(
         clusters.TemperatureControl.server.commands.SetTemperature(mock_device, APPLICATION_ENDPOINT, nil, 0) --0 is the index where Level1 is stored.
       }
     },
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -526,6 +547,9 @@ test.register_message_test(
         clusters.TemperatureControl.commands.SetTemperature(mock_device, APPLICATION_ENDPOINT, 40 * 100, nil)
       }
     },
+  },
+  {
+     min_api_version = 19
   }
 )
 

drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua

@@ -174,6 +174,9 @@ test.register_message_test(
         clusters.FanControl.attributes.PercentSetting:write(mock_device, 1, 50)
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -245,6 +248,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.fanMode.fanMode("auto"))
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -331,6 +337,9 @@ test.register_message_test(
         clusters.FanControl.attributes.FanMode:write(mock_device, 1, clusters.FanControl.types.FanModeEnum.AUTO)
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 test.register_message_test(
@@ -441,6 +450,9 @@ test.register_message_test(
         capabilities.fanMode.fanMode.high.NAME
       }, {visibility={displayed=false}}))
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -476,6 +488,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.windMode.windMode.naturalWind())
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -514,6 +529,9 @@ test.register_message_test(
         clusters.FanControl.attributes.WindSetting:write(mock_device, 1, clusters.FanControl.types.WindSettingMask.NATURAL_WIND)
       }
     }
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -572,6 +590,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("hepaFilter", capabilities.filterStatus.filterStatus.replace())
     },
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -630,6 +651,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("activatedCarbonFilter", capabilities.filterStatus.filterStatus.replace())
     },
+  },
+  {
+     min_api_version = 19
   }
 )
 
@@ -640,7 +664,10 @@ test.register_coroutine_test(
     mock_device_onoff:expect_metadata_update({ profile = "extractor-hood-wind-light" })
     mock_device_onoff:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
-  { test_init = test_init_onoff }
+  {
+    test_init = test_init_onoff,
+    min_api_version = 19
+  }
 )
 
 test.register_coroutine_test(
@@ -663,7 +690,10 @@ test.register_coroutine_test(
       clusters.OnOff.server.commands.Off(mock_device_onoff, 2)
     })
   end,
-  { test_init = test_init_onoff }
+  {
+    test_init = test_init_onoff,
+    min_api_version = 19
+  }
 )
 
 test.register_coroutine_test(
@@ -684,7 +714,10 @@ test.register_coroutine_test(
       mock_device_onoff:generate_test_message("light", capabilities.switch.switch.off())
     )
   end,
-  { test_init = test_init_onoff }
+  {
+    test_init = test_init_onoff,
+    min_api_version = 19
+  }
 )
 
 test.run_registered_tests()