Skip to content

Commit

Permalink
Update packages used by E2E, longhaul and stress jobs. (Azure#1501)
Browse files Browse the repository at this point in the history
ARM32 tests run on Raspbian 9, so they need to use the debian9 packages.
The ubuntu16.04 packages depend on libssl1.0.0 which does not exist in
Raspbian 9.

ARM64 tests run on Ubuntu 18.04, so they should use the ubuntu18.04 packages.
The ubuntu16.04 packages happen to work since ubuntu18.04 does have libssl1.0.0
but there is no reason to use the older distro's packages.
  • Loading branch information
arsing authored Aug 1, 2019
1 parent 50f43dd commit c3d4698
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions builds/e2e/longhaul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- agent-osbits -equals 32
- run-long-haul -equals true
variables:
edgelet.artifact.name: 'iotedged-ubuntu16.04-arm32v7'
edgelet.artifact.name: 'iotedged-debian9-arm32v7'
steps:
- checkout: none
- task: AzureKeyVault@1
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
- agent-osbits -equals 64
- run-long-haul -equals true
variables:
edgelet.artifact.name: 'iotedged-ubuntu16.04-aarch64'
edgelet.artifact.name: 'iotedged-ubuntu18.04-aarch64'
steps:
- checkout: none
- task: AzureKeyVault@1
Expand Down Expand Up @@ -413,4 +413,4 @@ jobs:
snitch.alert.url: '$(SnitchLongHaulAlertUrl)'
snitch.storage.account: '$(snitch.storage.account)'
snitch.storage.masterKey: '$(StorageAccountMasterKeyStress)'
loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
6 changes: 3 additions & 3 deletions builds/e2e/stresstest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- run-stress -equals true
- agent-osbits -equals 32
variables:
edgelet.artifact.name: 'iotedged-ubuntu16.04-arm32v7'
edgelet.artifact.name: 'iotedged-debian9-arm32v7'
steps:
- checkout: none
- task: AzureKeyVault@1
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
- run-stress -equals true
- agent-osbits -equals 64
variables:
edgelet.artifact.name: 'iotedged-ubuntu16.04-aarch64'
edgelet.artifact.name: 'iotedged-ubuntu18.04-aarch64'
steps:
- checkout: none
- task: AzureKeyVault@1
Expand Down Expand Up @@ -414,4 +414,4 @@ jobs:
snitch.alert.url: '$(SnitchStressAlertUrl)'
snitch.storage.account: '$(snitch.storage.account)'
snitch.storage.masterKey: '$(StorageAccountMasterKeyStress)'
loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
4 changes: 2 additions & 2 deletions scripts/linux/runE2ETest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ function get_iotedged_artifact_folder() {
if [ "$image_architecture_label" = 'amd64' ]; then
path="$E2E_TEST_DIR/artifacts/iotedged-ubuntu16.04-amd64"
elif [ "$image_architecture_label" = 'arm64v8' ]; then
path="$E2E_TEST_DIR/artifacts/iotedged-ubuntu16.04-aarch64"
path="$E2E_TEST_DIR/artifacts/iotedged-ubuntu18.04-aarch64"
else
path="$E2E_TEST_DIR/artifacts/iotedged-ubuntu16.04-arm32v7"
path="$E2E_TEST_DIR/artifacts/iotedged-debian9-arm32v7"
fi

echo "$path"
Expand Down

0 comments on commit c3d4698

Please sign in to comment.