Skip to content

Commit

Permalink
rpi os version update (#22)
Browse files Browse the repository at this point in the history
* rpi os version update

* PR feedback
  • Loading branch information
marianan authored May 17, 2021
1 parent 0c97af9 commit 769d490
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/validate-tier1-os.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function is_os_tier1() {
;;

raspbian)
if [ "$VERSION_CODENAME" == "stretch" ];
if [ "$VERSION_CODENAME" == "stretch" ] || [ "$VERSION_ID" == "9" ];
then
return 0
fi
Expand Down Expand Up @@ -69,7 +69,7 @@ function get_platform() {
;;

raspbian)
os_platform="$ID_LIKE/$VERSION_CODENAME"
os_platform="$ID_LIKE/stretch"
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion tests/unit-tests/test-validate-tier1-os.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?
}
Expand Down
7 changes: 2 additions & 5 deletions vsts_ci/linux/continuous-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
7 changes: 2 additions & 5 deletions vsts_ci/raspi/continuous-raspi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit 769d490

Please sign in to comment.