diff --git a/src/validate-tier1-os.sh b/src/validate-tier1-os.sh index bad07a3..15b721e 100644 --- a/src/validate-tier1-os.sh +++ b/src/validate-tier1-os.sh @@ -30,7 +30,7 @@ function is_os_tier1() { ;; raspbian) - if [ "$VERSION_CODENAME" == "stretch" ]; + if [ "$VERSION_CODENAME" == "stretch" ] || [ "$VERSION_ID" == "9" ]; then return 0 fi @@ -69,7 +69,7 @@ function get_platform() { ;; raspbian) - os_platform="$ID_LIKE/$VERSION_CODENAME" + os_platform="$ID_LIKE/stretch" ;; esac diff --git a/tests/unit-tests/test-validate-tier1-os.sh b/tests/unit-tests/test-validate-tier1-os.sh index ec8125a..1aa880a 100644 --- a/tests/unit-tests/test-validate-tier1-os.sh +++ b/tests/unit-tests/test-validate-tier1-os.sh @@ -12,7 +12,7 @@ test_ubuntu1804() { test_raspbian() { ID="raspbian" - VERSION_ID="10" + VERSION_ID="9" is_os_tier1 "$ID" "$VERSION_ID" assert_eq 0 $? } diff --git a/vsts_ci/linux/continuous-linux.yml b/vsts_ci/linux/continuous-linux.yml index 470f27f..c0e9aa0 100644 --- a/vsts_ci/linux/continuous-linux.yml +++ b/vsts_ci/linux/continuous-linux.yml @@ -4,14 +4,11 @@ steps: - script: | cd tests/unit-tests - chmod +x test-install-container-management.sh - chmod +x test-install-edge-runtime.sh - chmod +x test-validate-post-install.sh - chmod +x test-validate-tier1-os.sh - chmod +x test-cmd-parser.sh + chmod +x ./*.sh ./test-install-container-management.sh ./test-install-edge-runtime.sh ./test-validate-post-install.sh ./test-validate-tier1-os.sh ./test-cmd-parser.sh + ./test-logger.sh displayName: 'Run All Linux Unit Tests' diff --git a/vsts_ci/raspi/continuous-raspi.yml b/vsts_ci/raspi/continuous-raspi.yml index 4ab71d3..411ea54 100644 --- a/vsts_ci/raspi/continuous-raspi.yml +++ b/vsts_ci/raspi/continuous-raspi.yml @@ -4,15 +4,12 @@ steps: - script: | cd tests/unit-tests - chmod +x test-install-container-management.sh - chmod +x test-install-edge-runtime.sh - chmod +x test-validate-post-install.sh - chmod +x test-validate-tier1-os.sh - chmod +x test-cmd-parser.sh + chmod +x ./*.sh ./test-install-container-management.sh ./test-install-edge-runtime.sh ./test-validate-post-install.sh ./test-validate-tier1-os.sh ./test-cmd-parser.sh + ./test-logger.sh displayName: 'Run All Raspberry Pi Unit Tests'