From b8a940293f4a9d3833053d8af67d8d7c87955407 Mon Sep 17 00:00:00 2001 From: Technobly Date: Mon, 29 Apr 2019 21:01:04 -0500 Subject: [PATCH] [test] updates upgrade-downgrade, country-updown scripts --- .../scripts/country-updown/country-updown.sh | 110 +++++++++++------- .../upgrade-downgrade/upgrade-downgrade.sh | 71 ++++++----- 2 files changed, 106 insertions(+), 75 deletions(-) diff --git a/user/tests/scripts/country-updown/country-updown.sh b/user/tests/scripts/country-updown/country-updown.sh index c88b96eaa2..4531ce0ae6 100644 --- a/user/tests/scripts/country-updown/country-updown.sh +++ b/user/tests/scripts/country-updown/country-updown.sh @@ -27,6 +27,10 @@ export PHOTON_SP1_053_RC2="https://github.com/particle-iot/device-os/releases/do export PHOTON_SP2_053_RC2="https://github.com/particle-iot/device-os/releases/download/v0.5.3-rc.2/system-part2-0.5.3-rc.2-photon.bin" export PHOTON_SP1_053_RC3="https://github.com/particle-iot/device-os/releases/download/v0.5.3-rc.3/system-part1-0.5.3-rc.3-photon.bin" export PHOTON_SP2_053_RC3="https://github.com/particle-iot/device-os/releases/download/v0.5.3-rc.3/system-part2-0.5.3-rc.3-photon.bin" +export PHOTON_SP1_055="https://github.com/particle-iot/device-os/releases/download/v0.5.5/system-part1-0.5.5-photon.bin" +export PHOTON_SP2_055="https://github.com/particle-iot/device-os/releases/download/v0.5.5/system-part2-0.5.5-photon.bin" +export PHOTON_SP1_055_MOD=23 +export PHOTON_SP2_055_MOD=23 export PHOTON_SP1_060_RC1="https://github.com/particle-iot/device-os/releases/download/v0.6.0-rc.1/system-part1-0.6.0-rc.1-photon.bin" export PHOTON_SP2_060_RC1="https://github.com/particle-iot/device-os/releases/download/v0.6.0-rc.1/system-part2-0.6.0-rc.1-photon.bin" export PHOTON_SP1_060_RC2="https://github.com/particle-iot/device-os/releases/download/v0.6.0-rc.2/system-part1-0.6.0-rc.2-photon.bin" @@ -48,8 +52,8 @@ export PHOTON_SP1_070="https://github.com/particle-iot/device-os/releases/downlo export PHOTON_SP2_070="https://github.com/particle-iot/device-os/releases/download/v0.7.0/system-part2-0.7.0-photon.bin" export PHOTON_SP1_101="https://github.com/particle-iot/device-os/releases/download/v1.0.1/system-part1-1.0.1-photon.bin" export PHOTON_SP2_101="https://github.com/particle-iot/device-os/releases/download/v1.0.1/system-part2-1.0.1-photon.bin" -export PHOTON_SP1_110_RC1="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.1/system-part1-1.1.0-rc.1-photon.bin" -export PHOTON_SP2_110_RC1="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.1/system-part2-1.1.0-rc.1-photon.bin" +export PHOTON_SP1_110_RC2="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.2/system-part1-1.1.0-rc.2-photon.bin" +export PHOTON_SP2_110_RC2="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.2/system-part2-1.1.0-rc.2-photon.bin" # instead of these set options, @@ -81,11 +85,11 @@ dfu() { #fi } check_bash_version() { - if [[ $BASH_VERSION == 4.* ]] ; + if [[ $BASH_VERSION == 4.* ]] || [[ $BASH_VERSION == 5.* ]] ; then echo "Bash $BASH_VERSION found! let's do this ~_~"; else - echo "Bash 4.x required for associative arrays! See upgrade instructions here:"\ + echo "Bash >= 4.x required for associative arrays! See upgrade instructions here:"\ "http://clubmate.fi/upgrade-to-bash-4-in-mac-os-x/"; exit 1; fi @@ -286,6 +290,12 @@ curl_all_required_system_parts() { if [ ! -e "system-part2-0.5.3-rc.3-photon.bin" ]; then curl --fail -L "$PHOTON_SP2_053_RC3" -o "system-part2-0.5.3-rc.3-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi + if [ ! -e "system-part1-0.5.5-photon.bin" ]; then + curl --fail -L "$PHOTON_SP1_055" -o "system-part1-0.5.5-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + fi + if [ ! -e "system-part2-0.5.5-photon.bin" ]; then + curl --fail -L "$PHOTON_SP2_055" -o "system-part2-0.5.5-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + fi if [ ! -e "system-part1-0.6.0-rc.1-photon.bin" ]; then curl --fail -L "$PHOTON_SP1_060_RC1" -o "system-part1-0.6.0-rc.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi @@ -357,11 +367,11 @@ curl_all_required_system_parts() { curl --fail -L "$PHOTON_SP2_101" -o "system-part2-1.0.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi - if [ ! -e "system-part1-1.1.0-rc.1-photon.bin" ]; then - curl --fail -L "$PHOTON_SP1_110_RC1" -o "system-part1-1.1.0-rc.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + if [ ! -e "system-part1-1.1.0-rc.2-photon.bin" ]; then + curl --fail -L "$PHOTON_SP1_110_RC1" -o "system-part1-1.1.0-rc.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi - if [ ! -e "system-part2-1.1.0-rc.1-photon.bin" ]; then - curl --fail -L "$PHOTON_SP2_110_RC1" -o "system-part2-1.1.0-rc.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + if [ ! -e "system-part2-1.1.0-rc.2-photon.bin" ]; then + curl --fail -L "$PHOTON_SP2_110_RC1" -o "system-part2-1.1.0-rc.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi if [ ! -e "tinker-v0.4.9-photon.bin" ]; then @@ -594,14 +604,14 @@ fail() { # 87 | JP2 | 050 | DEFAULT | 101 | GB0 | 070/063/050 | wiped creds, re-enter # 88 | JP2 | 050 | DEFAULT | 101 | DEFAULT | 070/063/050 | re-test, online # ----+---------+---------+---------+------------+---------+-----------------+---------------------- -# 89 | JP2 | 050 | DEFAULT | 110rc1 | N/A | 070/063/050 | online -# 90 | JP2 | 050 | DEFAULT | 051/110rc1 | N/A | 070/063/050 | online -# 91 | JP2 | 050 | DEFAULT | 110rc1 | N/A | 070/063/051 | online -# 92 | JP2 | 050 | DEFAULT | 110rc1 | JP2 | 070/063/050 | online -# 93 | JP2 | 050 | DEFAULT | 051/110rc1 | JP2 | 070/063/050 | online -# 94 | JP2 | 050 | DEFAULT | 110rc1 | JP2 | 070/063/051 | online -# 95 | JP2 | 050 | DEFAULT | 110rc1 | GB0 | 070/063/050 | wiped creds, re-enter -# 96 | JP2 | 050 | DEFAULT | 110rc1 | DEFAULT | 070/063/050 | re-test, online +# 89 | JP2 | 050 | DEFAULT | 110rc2 | N/A | 070/063/050 | online +# 90 | JP2 | 050 | DEFAULT | 051/110rc2 | N/A | 070/063/050 | online +# 91 | JP2 | 050 | DEFAULT | 110rc2 | N/A | 070/063/051 | online +# 92 | JP2 | 050 | DEFAULT | 110rc2 | JP2 | 070/063/050 | online +# 93 | JP2 | 050 | DEFAULT | 051/110rc2 | JP2 | 070/063/050 | online +# 94 | JP2 | 050 | DEFAULT | 110rc2 | JP2 | 070/063/051 | online +# 95 | JP2 | 050 | DEFAULT | 110rc2 | GB0 | 070/063/050 | wiped creds, re-enter +# 96 | JP2 | 050 | DEFAULT | 110rc2 | DEFAULT | 070/063/050 | re-test, online # ----+---------+---------+---------+------------+---------+-----------------+---------------------- # LAST TEST | ALL PASSED # ------------------------- @@ -617,12 +627,18 @@ if true; then try dfu6user "tinker-v0.4.9-photon.bin" try exit_dfu_mode + enter_dfu_mode + try dfu_system 0.5.5 photon + try exit_dfu_mode + + sleep 10 + enter_dfu_mode try dfu_system 0.5.0 photon try exit_dfu_mode - # enter_ymodem - try ymodem_boot 0.5.4 photon + # # enter_ymodem + # try ymodem_boot 0.5.4 photon enter_dfu_mode set_country JP2 @@ -3214,12 +3230,12 @@ fi if true; then # ------ - # 110rc1 + # 110rc2 # ------ heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 89 | JP2 | 050 | DEFAULT | 110rc1 | N/A | 070/063/050 | online |" + echo "| 89 | JP2 | 050 | DEFAULT | 110rc2 | N/A | 070/063/050 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3231,10 +3247,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3251,12 +3267,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 90 | JP2 | 050 | DEFAULT | 051/110rc1 | N/A | 070/063/050 | online |" + echo "| 90 | JP2 | 050 | DEFAULT | 051/110rc2 | N/A | 070/063/050 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3272,10 +3289,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3292,12 +3309,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 91 | JP2 | 050 | DEFAULT | 110rc1 | N/A | 070/063/051 | online |" + echo "| 91 | JP2 | 050 | DEFAULT | 110rc2 | N/A | 070/063/051 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3309,10 +3327,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3329,12 +3347,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 92 | JP2 | 050 | DEFAULT | 110rc1 | JP2 | 070/063/050 | online |" + echo "| 92 | JP2 | 050 | DEFAULT | 110rc2 | JP2 | 070/063/050 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3346,10 +3365,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3370,12 +3389,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 93 | JP2 | 050 | DEFAULT | 051/110rc1 | JP2 | 070/063/050 | online |" + echo "| 93 | JP2 | 050 | DEFAULT | 051/110rc2 | JP2 | 070/063/050 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3391,10 +3411,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3415,12 +3435,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 94 | JP2 | 050 | DEFAULT | 110rc1 | JP2 | 070/063/051 | online |" + echo "| 94 | JP2 | 050 | DEFAULT | 110rc2 | JP2 | 070/063/051 | online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3432,10 +3453,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3456,12 +3477,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 95 | JP2 | 050 | DEFAULT | 110rc1 | GB0 | 070/063/050 | wiped creds, re-enter |" + echo "| 95 | JP2 | 050 | DEFAULT | 110rc2 | GB0 | 070/063/050 | wiped creds, re-enter |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_dfu_mode try set_country JP2 @@ -3473,10 +3495,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3497,12 +3519,13 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_offline heading echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" - echo "| 96 | JP2 | 050 | DEFAULT | 110rc1 | DEFAULT | 070/063/050 | re-test, online |" + echo "| 96 | JP2 | 050 | DEFAULT | 110rc2 | DEFAULT | 070/063/050 | re-test, online |" echo "+----+---------+---------+---------+------------+---------+-----------------+------------------------+" enter_ymodem @@ -3518,10 +3541,10 @@ if true; then try exit_dfu_mode enter_dfu_mode - try dfu_system 1.1.0-rc.1 photon + try dfu_system 1.1.0-rc.2 photon try exit_dfu_mode - # wait for 1.1.0-rc.1 bootloader from SMH + # wait for 1.1.0-rc.2 bootloader from SMH sleep 30 enter_dfu_mode @@ -3538,6 +3561,7 @@ if true; then enter_ymodem try ymodem_boot 0.5.4 photon + sleep 20 try run_cli_list_subcommand_and_confirm_device_shows_up_as_online diff --git a/user/tests/scripts/upgrade-downgrade/upgrade-downgrade.sh b/user/tests/scripts/upgrade-downgrade/upgrade-downgrade.sh index efe9d65a83..415a849bc0 100644 --- a/user/tests/scripts/upgrade-downgrade/upgrade-downgrade.sh +++ b/user/tests/scripts/upgrade-downgrade/upgrade-downgrade.sh @@ -28,8 +28,8 @@ export PHOTON_SP1_052="https://github.com/particle-iot/device-os/releases/downlo export PHOTON_SP2_052="https://github.com/particle-iot/device-os/releases/download/v0.5.2/system-part2-0.5.2-photon.bin" export PHOTON_SP1_052_MOD=17 export PHOTON_SP2_052_MOD=17 -export PHOTON_SP1_053_RC1="https://github.com/particle-iot/device-os/releases/download/v0.5.2/system-part1-0.5.3-rc.1-photon.bin" -export PHOTON_SP2_053_RC1="https://github.com/particle-iot/device-os/releases/download/v0.5.2/system-part2-0.5.3-rc.1-photon.bin" +export PHOTON_SP1_053_RC1="https://github.com/particle-iot/device-os/releases/download/v0.5.3-rc.1/system-part1-0.5.3-rc.1-photon.bin" +export PHOTON_SP2_053_RC1="https://github.com/particle-iot/device-os/releases/download/v0.5.3-rc.1/system-part2-0.5.3-rc.1-photon.bin" export PHOTON_SP1_053_RC1_MOD=18 export PHOTON_SP2_053_RC1_MOD=18 export PHOTON_SP1_055="https://github.com/particle-iot/device-os/releases/download/v0.5.5/system-part1-0.5.5-photon.bin" @@ -76,10 +76,10 @@ export PHOTON_SP1_101="https://github.com/particle-iot/device-os/releases/downlo export PHOTON_SP2_101="https://github.com/particle-iot/device-os/releases/download/v1.0.1/system-part2-1.0.1-photon.bin" export PHOTON_SP1_101_MOD=1002 export PHOTON_SP2_101_MOD=1002 -export PHOTON_SP1_110_RC1="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.1/system-part1-1.1.0-rc.1-photon.bin" -export PHOTON_SP2_110_RC1="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.1/system-part2-1.1.0-rc.1-photon.bin" -export PHOTON_SP1_110_RC1_MOD=1100 -export PHOTON_SP2_110_RC1_MOD=1100 +export PHOTON_SP1_110_RC2="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.2/system-part1-1.1.0-rc.2-photon.bin" +export PHOTON_SP2_110_RC2="https://github.com/particle-iot/device-os/releases/download/v1.1.0-rc.2/system-part2-1.1.0-rc.2-photon.bin" +export PHOTON_SP1_110_RC2_MOD=1101 +export PHOTON_SP2_110_RC2_MOD=1101 # instead of these set options, # set script options @@ -107,11 +107,11 @@ dfu() { return 0; } check_bash_version() { - if [[ $BASH_VERSION == 4.* ]] ; + if [[ $BASH_VERSION == 4.* ]] || [[ $BASH_VERSION == 5.* ]] ; then echo "Bash $BASH_VERSION found! let's do this ~_~"; else - echo "Bash 4.x required for associative arrays! See upgrade instructions here:"\ + echo "Bash >= 4.x required for associative arrays! See upgrade instructions here:"\ "http://clubmate.fi/upgrade-to-bash-4-in-mac-os-x/"; exit 1; fi @@ -378,11 +378,11 @@ set_country() { # | 63 | photon | 0.7.0 | 1.0.0 | part1, part2 | yes | ok | # | 64 | photon | 1.0.0 | 1.0.1 | part2, part1 | no, part2 rejected | ok | # | 65 | photon | 1.0.0 | 1.0.1 | part1, part2 | yes | ok | -# | 66 | photon | 1.0.1 | 1.1.0-rc.1 | part2, part1 | no, part2 rejected | ok | -# | 67 | photon | 1.0.1 | 1.1.0-rc.1 | part1, part2 | yes | ok | +# | 66 | photon | 1.0.1 | 1.1.0-rc.2 | part2, part1 | no, part2 rejected | ok | +# | 67 | photon | 1.0.1 | 1.1.0-rc.2 | part1, part2 | yes | ok | # ------------------------ downgrade -------------------------------------------------------------+ -# | 68 | photon | 1.1.0-rc.1 | 1.0.0 | part1, part2 | no, part1 rejected | ok | -# | 69 | photon | 1.1.0-rc.1 | 1.0.0 | part2, part1 | yes | ok | +# | 68 | photon | 1.1.0-rc.2 | 1.0.0 | part1, part2 | no, part1 rejected | ok | +# | 69 | photon | 1.1.0-rc.2 | 1.0.0 | part2, part1 | yes | ok | # | 70 | photon | 1.0.0 | 0.7.0 | part1, part2 | no, part1 rejected | ok | # | 71 | photon | 1.0.0 | 0.7.0 | part2, part1 | yes | ok | # | 72 | photon | 0.7.0 | 0.6.3 | part1, part2 | no, part1 rejected | ok | @@ -409,12 +409,17 @@ if true; then # ensure an old compatible version of tinker, system firmware and bootloader is on the device enter_dfu_mode try dfu6user "tinker-v0.4.9-photon.bin" - # start with 0.5.2 + # first downgrade to 0.5.5 to downgrade the bootloader + try dfu_system 0.5.5 photon + try exit_dfu_mode + sleep 10 + # then downgrade to 0.5.2 + enter_dfu_mode try dfu_system 0.5.2 photon try exit_dfu_mode - enter_ymodem - try ymodem_boot 0.5.4 photon + # enter_ymodem + # try ymodem_boot 0.5.4 photon try run_cli_list_subcommand_and_confirm_device_shows_up_as_online enter_ymodem @@ -1693,10 +1698,10 @@ if true; then heading echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" - echo "| 66 | photon | 1.0.1 | 1.1.0-rc.1 | part2, part1 | no, part2 rejected | ok |" + echo "| 66 | photon | 1.0.1 | 1.1.0-rc.2 | part2, part1 | no, part2 rejected | ok |" echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" enter_ymodem - ymodem_part 2 1.1.0-rc.1 photon + ymodem_part 2 1.1.0-rc.2 photon enter_dfu_mode try exit_dfu_mode @@ -1708,18 +1713,18 @@ if true; then heading echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" - echo "| 67 | photon | 1.0.1 | 1.1.0-rc.1 | part1, part2 | yes | ok |" + echo "| 67 | photon | 1.0.1 | 1.1.0-rc.2 | part1, part2 | yes | ok |" echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" enter_ymodem - try ymodem_part 1 1.1.0-rc.1 photon + try ymodem_part 1 1.1.0-rc.2 photon try run_cli_list_subcommand_and_confirm_device_shows_up_as_online enter_ymodem try serial_inspect - try compare_system_version 1 ${PHOTON_SP1_110_RC1_MOD} + try compare_system_version 1 ${PHOTON_SP1_110_RC2_MOD} try compare_system_version 2 ${PHOTON_SP2_101_MOD} enter_ymodem - try ymodem_part 2 1.1.0-rc.1 photon + try ymodem_part 2 1.1.0-rc.2 photon # wait for 1.0.0 bootloader from SMH # particle flash --serial bootloader-1.0.0-photon.bin sleep 30 @@ -1727,8 +1732,8 @@ if true; then try run_cli_list_subcommand_and_confirm_device_shows_up_as_online enter_ymodem try serial_inspect - try compare_system_version 1 ${PHOTON_SP1_110_RC1_MOD} - try compare_system_version 2 ${PHOTON_SP2_110_RC1_MOD} + try compare_system_version 1 ${PHOTON_SP1_110_RC2_MOD} + try compare_system_version 2 ${PHOTON_SP2_110_RC2_MOD} pass # ------------------------ downgrade ------------------------------------------------------------- @@ -1736,7 +1741,7 @@ if true; then # ------------------------ downgrade ------------------------------------------------------------- heading echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" - echo "| 68 | photon | 1.1.0-rc.1 | 1.0.1 | part1, part2 | no, part1 rejected | ok |" + echo "| 68 | photon | 1.1.0-rc.2 | 1.0.1 | part1, part2 | no, part1 rejected | ok |" echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" enter_ymodem ymodem_part 1 1.0.1 photon @@ -1746,20 +1751,20 @@ if true; then try run_cli_list_subcommand_and_confirm_device_shows_up_as_online enter_ymodem try serial_inspect - try compare_system_version 1 ${PHOTON_SP1_110_RC1_MOD} - try compare_system_version 2 ${PHOTON_SP2_110_RC1_MOD} + try compare_system_version 1 ${PHOTON_SP1_110_RC2_MOD} + try compare_system_version 2 ${PHOTON_SP2_110_RC2_MOD} pass heading echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" - echo "| 69 | photon | 1.1.0-rc.1 | 1.0.1 | part2, part1 | yes | ok |" + echo "| 69 | photon | 1.1.0-rc.2 | 1.0.1 | part2, part1 | yes | ok |" echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" enter_ymodem try ymodem_part 2 1.0.1 photon try run_cli_list_subcommand_and_confirm_device_shows_up_as_online enter_ymodem try serial_inspect - try compare_system_version 1 ${PHOTON_SP1_110_RC1_MOD} + try compare_system_version 1 ${PHOTON_SP1_110_RC2_MOD} try compare_system_version 2 ${PHOTON_SP2_101_MOD} enter_ymodem @@ -1959,6 +1964,8 @@ if true; then echo "+-----------+------------+" echo "| LAST TEST | ALL PASSED |" echo "+-----------+------------+" + enter_dfu_mode + try exit_dfu_mode pass exit 0; fi @@ -2122,11 +2129,11 @@ curl_all_required_system_parts() { curl -L "$PHOTON_SP2_101" -o "system-part2-1.0.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi - if [ ! -e "system-part1-1.1.0-rc.1-photon.bin" ]; then - curl -L "$PHOTON_SP1_110_RC1" -o "system-part1-1.1.0-rc.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + if [ ! -e "system-part1-1.1.0-rc.2-photon.bin" ]; then + curl -L "$PHOTON_SP1_110_RC1" -o "system-part1-1.1.0-rc.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi - if [ ! -e "system-part2-1.1.0-rc.1-photon.bin" ]; then - curl -L "$PHOTON_SP2_110_RC1" -o "system-part2-1.1.0-rc.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi + if [ ! -e "system-part2-1.1.0-rc.2-photon.bin" ]; then + curl -L "$PHOTON_SP2_110_RC1" -o "system-part2-1.1.0-rc.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi fi if [ ! -e "tinker-v0.4.9-photon.bin" ]; then