Skip to content

Commit 0967b44

Browse files
committed
REMOVEME: Enable multiple retries
1 parent 72642b5 commit 0967b44

File tree

14 files changed

+17
-27
lines changed

14 files changed

+17
-27
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
# see https://github.com/haskell/stm/issues/76
4141
ghc: ["9.6", "9.10"]
4242
cabal: ["3.12"]
43+
n: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]
4344
sys:
4445
- { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }
4546
- { os: ubuntu-latest, shell: bash }
@@ -62,17 +63,6 @@ jobs:
6263
MSYS2_PATH_TYPE: inherit
6364
MSYSTEM: MINGW64
6465

65-
concurrency:
66-
group: >
67-
a+${{ github.event_name }}
68-
b+${{ github.workflow_ref }}
69-
c+${{ github.job }}
70-
d+${{ matrix.ghc }}
71-
e+${{ matrix.cabal }}
72-
f+${{ matrix.sys.os }}
73-
g+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
74-
cancel-in-progress: true
75-
7666
steps:
7767
- name: Concurrency group
7868
run: >
@@ -180,7 +170,7 @@ jobs:
180170
if: ${{ failure() }}
181171
uses: actions/upload-artifact@v4
182172
with:
183-
name: failed-test-workspaces-${{ matrix.sys.os }}-ghc${{ matrix.ghc }}-cabal${{ matrix.cabal }}.tgz
173+
name: failed-test-workspaces-${{ matrix.sys.os }}-ghc${{ matrix.ghc }}-cabal${{ matrix.cabal }}-${{ matrix.n }}.tgz
184174
path: ${{ runner.temp }}/workspaces.tgz
185175

186176
- name: "Tar artifacts"

cardano-node-chairman/test/Spec/Chairman/Cardano.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import qualified Hedgehog.Extras as H
1616
import Spec.Chairman.Chairman (chairmanOver)
1717

1818
hprop_chairman :: H.Property
19-
hprop_chairman = integrationRetryWorkspace 2 "cardano-chairman" $ \tempAbsPath' -> H.runWithDefaultWatchdog_ $ do
19+
hprop_chairman = integrationRetryWorkspace 0 "cardano-chairman" $ \tempAbsPath' -> H.runWithDefaultWatchdog_ $ do
2020
conf <- mkConf tempAbsPath'
2121

2222
allNodes' <- allNodes <$> cardanoTestnetDefault def def conf

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/StakeSnapshot.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import qualified Hedgehog.Extras.Test.Base as H
3030
import qualified Hedgehog.Extras.Test.TestWatchdog as H
3131

3232
hprop_stakeSnapshot :: Property
33-
hprop_stakeSnapshot = integrationRetryWorkspace 2 "conway-stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
33+
hprop_stakeSnapshot = integrationRetryWorkspace 0 "conway-stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
3434
H.note_ SYS.os
3535
conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
3636
let tempAbsPath' = unTmpAbsPath tempAbsPath

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
5353
-- | Execute me with:
5454
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/kes-period-info/"'@
5555
hprop_kes_period_info :: Property
56-
hprop_kes_period_info = integrationRetryWorkspace 2 "kes-period-info" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
56+
hprop_kes_period_info = integrationRetryWorkspace 0 "kes-period-info" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
5757
H.note_ SYS.os
5858
conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) }
5959
-- TODO: Move yaml filepath specification into individual node options

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
5656
-- | Execute me with:
5757
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/leadership-schedule/"'@
5858
hprop_leadershipSchedule :: Property
59-
hprop_leadershipSchedule = integrationRetryWorkspace 2 "leadership-schedule" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
59+
hprop_leadershipSchedule = integrationRetryWorkspace 0 "leadership-schedule" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
6060
H.note_ SYS.os
6161
conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } <- mkConf tempAbsBasePath'
6262
let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import qualified Hedgehog.Internal.Property as H
3636

3737
-- | Tests @query slot-number@ cardano-cli command that it returns correct slot numbers for provided utc time
3838
hprop_querySlotNumber :: Property
39-
hprop_querySlotNumber = integrationRetryWorkspace 2 "query-slot-number" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
39+
hprop_querySlotNumber = integrationRetryWorkspace 0 "query-slot-number" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
4040
H.note_ SYS.os
4141
conf <- mkConf tempAbsBasePath'
4242

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/StakeSnapshot.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import qualified Hedgehog.Extras.Test.Base as H
3131
import qualified Hedgehog.Extras.Test.TestWatchdog as H
3232

3333
hprop_stakeSnapshot :: Property
34-
hprop_stakeSnapshot = integrationRetryWorkspace 2 "stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
34+
hprop_stakeSnapshot = integrationRetryWorkspace 0 "stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
3535
H.note_ SYS.os
3636
conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
3737
let tempAbsPath' = unTmpAbsPath tempAbsPath

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
4444
-- | Execute me with:
4545
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/simple transaction build/"'@
4646
hprop_transaction :: Property
47-
hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
47+
hprop_transaction = integrationRetryWorkspace 0 "simple transaction build" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
4848
H.note_ SYS.os
4949
conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
5050
let tempAbsPath' = unTmpAbsPath tempAbsPath

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sbe = ShelleyBasedEraConway
3939
-- Execute this test with:
4040
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/DRepRetirement/"'@
4141
hprop_drep_retirement :: Property
42-
hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
42+
hprop_drep_retirement = integrationRetryWorkspace 0 "drep-retirement" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
4343
-- Start a local test net
4444
conf@Conf { tempAbsPath } <- H.noteShowM $ mkConf tempAbsBasePath'
4545
let tempAbsPath' = unTmpAbsPath tempAbsPath

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import qualified Hedgehog.Extras as H
4747
-- | Execute me with:
4848
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/InfoAction/'@
4949
hprop_ledger_events_info_action :: Property
50-
hprop_ledger_events_info_action = integrationRetryWorkspace 2 "info-hash" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
50+
hprop_ledger_events_info_action = integrationRetryWorkspace 0 "info-hash" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
5151

5252

5353
conf@Conf { tempAbsPath } <- H.noteShowM $ mkConf tempAbsBasePath'

0 commit comments

Comments
 (0)