Skip to content

Commit aaab173

Browse files
agadgil-progressagadgil-progress
committed
More e2e test fixes
- Using retries for anka failures - Using proper '/opt' prefix during test assertions - Using the 'aarch64-darwin-opt' channel for builder connection Signed-off-by: Abhijit Gadgil <agadgil@progress.com>
1 parent 04adb1c commit aaab173

7 files changed

+53
-10
lines changed

‎.expeditor/end_to_end.pipeline.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,9 @@ steps:
11901190
HOMEBREW_NO_AUTO_UPDATE: 1
11911191
HOMEBREW_NO_INSTALL_CLEANUP: 1
11921192
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1193+
retry:
1194+
automatic:
1195+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
11931196

11941197
- label: "[:mac: test_studio_version]"
11951198
commands:
@@ -1210,6 +1213,9 @@ steps:
12101213
HOMEBREW_NO_AUTO_UPDATE: 1
12111214
HOMEBREW_NO_INSTALL_CLEANUP: 1
12121215
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1216+
retry:
1217+
automatic:
1218+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
12131219

12141220
- label: "[:mac: test_studio_can_build_packages]"
12151221
commands:
@@ -1230,6 +1236,9 @@ steps:
12301236
HOMEBREW_NO_AUTO_UPDATE: 1
12311237
HOMEBREW_NO_INSTALL_CLEANUP: 1
12321238
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1239+
retry:
1240+
automatic:
1241+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
12331242

12341243
- label: "[:mac: test_pkg_download]"
12351244
commands:
@@ -1250,6 +1259,9 @@ steps:
12501259
HOMEBREW_NO_AUTO_UPDATE: 1
12511260
HOMEBREW_NO_INSTALL_CLEANUP: 1
12521261
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1262+
retry:
1263+
automatic:
1264+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
12531265

12541266
- label: "[:mac: test_fresh_install_can_communicate_with_builder]"
12551267
commands:
@@ -1270,6 +1282,9 @@ steps:
12701282
HOMEBREW_NO_AUTO_UPDATE: 1
12711283
HOMEBREW_NO_INSTALL_CLEANUP: 1
12721284
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1285+
retry:
1286+
automatic:
1287+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
12731288

12741289
- label: "[:mac: test_self_signed_cert_is_loaded_by_hab]"
12751290
commands:
@@ -1290,6 +1305,9 @@ steps:
12901305
HOMEBREW_NO_AUTO_UPDATE: 1
12911306
HOMEBREW_NO_INSTALL_CLEANUP: 1
12921307
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1308+
retry:
1309+
automatic:
1310+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
12931311

12941312
- label: "[:mac: test_hab_plan_cli]"
12951313
commands:
@@ -1310,6 +1328,9 @@ steps:
13101328
HOMEBREW_NO_AUTO_UPDATE: 1
13111329
HOMEBREW_NO_INSTALL_CLEANUP: 1
13121330
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1331+
retry:
1332+
automatic:
1333+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
13131334

13141335
- label: "[:mac: test_pkg_uninstall_darwin]"
13151336
commands:
@@ -1330,6 +1351,9 @@ steps:
13301351
HOMEBREW_NO_AUTO_UPDATE: 1
13311352
HOMEBREW_NO_INSTALL_CLEANUP: 1
13321353
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1354+
retry:
1355+
automatic:
1356+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
13331357

13341358
- label: "[:mac: test_simple_hooks_darwin]"
13351359
commands:
@@ -1350,6 +1374,9 @@ steps:
13501374
HOMEBREW_NO_AUTO_UPDATE: 1
13511375
HOMEBREW_NO_INSTALL_CLEANUP: 1
13521376
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1377+
retry:
1378+
automatic:
1379+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
13531380

13541381
- label: "[:mac: test_external_binaries_darwin]"
13551382
commands:
@@ -1370,6 +1397,9 @@ steps:
13701397
HOMEBREW_NO_AUTO_UPDATE: 1
13711398
HOMEBREW_NO_INSTALL_CLEANUP: 1
13721399
HAB_INTERNAL_BLDR_CHANNEL: unstable # TODO: remove this after testing
1400+
retry:
1401+
automatic:
1402+
limit: 3 # Addressing current Anka system timeouts due to oversubscription
13731403

13741404
- wait
13751405

‎test/end-to-end/test_external_binaries_darwin.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# hab pkg exec instead, which is the underlying mechanism for running
55
# external package binaries.
66

7-
$channel = "aarch64-darwin"
7+
$channel = "aarch64-darwin-opt"
88

99
Describe "`hab` correctly executes external binaries" {
1010
BeforeAll {

‎test/end-to-end/test_fresh_install_can_communicate_with_builder.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Describe "Clean hab installation" {
1414
}
1515
It "can talk to builder" {
1616
if ($IsMacOS) {
17-
$pkgChannel = "aarch64-darwin"
17+
$pkgChannel = "aarch64-darwin-opt"
1818
# core/redis may not exist for aarch64-darwin; use core/nginx instead
1919
hab pkg install core/nginx --channel $pkgChannel
2020
} else {

‎test/end-to-end/test_pkg_uninstall_darwin.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
$pkg = "core/sqlite"
44
$nginxPkg = "core/nginx"
5-
$channel = "aarch64-darwin"
5+
$channel = "aarch64-darwin-opt"
66
$env:HAB_NOCOLORING = "true"
77

88
Describe "pkg uninstall (macOS)" {

‎test/end-to-end/test_self_signed_cert_is_loaded_by_hab.ps1‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
# to talk to a builder service with a self-signed cert.
66

77
Describe "Self signed cert" {
8-
New-Item -ItemType Directory /hab/cache/ssl
9-
$e2e_cert = "/hab/cache/ssl/e2e-ssl.pem"
8+
if ($IsMacOS) {
9+
New-Item -ItemType Directory /opt/hab/cache/ssl
10+
$e2e_cert = "/opt/hab/cache/ssl/e2e-ssl.pem"
11+
} else {
12+
New-Item -ItemType Directory /hab/cache/ssl
13+
$e2e_cert = "/hab/cache/ssl/e2e-ssl.pem"
14+
}
1015
openssl req -newkey rsa:2048 -batch -nodes -subj "/CN=e2e-test" -keyout key.pem -x509 -days 365 -out "${e2e_cert}"
1116

1217
It "should be used by bldr client" {

‎test/end-to-end/test_simple_hooks_darwin.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Describe "Hook extension stripping and execution" {
1111
. ./results/last_build.ps1
1212
$script:pkgIdent = $pkg_ident
1313
$script:pkgName = ($pkg_ident -split "/")[1]
14-
$script:pkgPrefix = "/hab/pkgs/$pkg_ident"
14+
$script:pkgPrefix = "/opt/hab/pkgs/$pkg_ident"
1515
}
1616

1717
It "strips .sh extension from hook files" {
@@ -30,7 +30,7 @@ Describe "Hook extension stripping and execution" {
3030
}
3131

3232
It "install hook renders templates and produces stdout" {
33-
$logPath = "/hab/svc/$($script:pkgName)/logs/install.stdout.log"
33+
$logPath = "/opt/hab/svc/$($script:pkgName)/logs/install.stdout.log"
3434
$logPath | Should -Exist
3535
Get-Content $logPath | Should -Contain "install hook $($script:pkgName)"
3636
}

‎test/end-to-end/test_studio_can_build_packages.ps1‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ Describe "Studio build" {
4141
Invoke-Build minimal-package
4242
. ./results/last_build.ps1
4343

44-
"/hab/cache/artifacts/$pkg_artifact" | Should -Exist
44+
if($IsMacOS) {
45+
"/opt/hab/cache/artifacts/$pkg_artifact" | Should -Exist
46+
} else {
47+
"/hab/cache/artifacts/$pkg_artifact" | Should -Exist
48+
}
4549
}
4650

4751
if($IsWindows) {
@@ -64,7 +68,11 @@ Describe "Studio build" {
6468
Invoke-BuildAndInstall hook-extension-plan
6569
. ./results/last_build.ps1
6670

67-
"/hab/pkgs/$pkg_ident/hooks/install" | Should -Exist
71+
if ($IsMacOS) {
72+
"/opt/hab/pkgs/$pkg_ident/hooks/install" | Should -Exist
73+
} else {
74+
"/hab/pkgs/$pkg_ident/hooks/install" | Should -Exist
75+
}
6876
}
6977

7078
It "fails when there are multiple extensions" {
@@ -182,4 +190,4 @@ Describe "Targeting different refresh channels" {
182190
"/hab/pkgs/$pkg_ident/TDEPS" | Should -FileContentMatch "core/zlib/1.3"
183191
}
184192
}
185-
}
193+
}

0 commit comments

Comments
 (0)