Private data purge test improvements - release-2.5 backport (#4577)

* Move purge private data tests to separate runner Signed-off-by: andrew-coleman <[email protected]> * Expedite purge private data integration tests Combine purge private data tests into a single 'It' to improve speed. This will remove the excessive network teardowns, network builds, and chaincode deployments. Also remove unneccessary delays and redundant ledger entries. Signed-off-by: David Enyeart <[email protected]> * Address private data purge integration test comments Address comments from #3991. Namely, speed up reconciliation test by looking for reconcilliation message rather than sleeping for 30s. Also change default reconcilliation from 10s to 5s to speed up tests. Signed-off-by: David Enyeart <[email protected]> * Fix purge private data integration test flake Prior test restarted peers. Need to make sure all peers are up and connected before continuing to next test. Signed-off-by: David Enyeart <[email protected]> --------- Signed-off-by: andrew-coleman <[email protected]> Signed-off-by: David Enyeart <[email protected]> Co-authored-by: andrew-coleman <[email protected]>
hyperledger · Dec 17, 2023 · e276334 · e276334
1 parent 47f7f95
commit e276334
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 182 deletions.
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        INTEGRATION_TEST_SUITE: ["raft","pvtdata","ledger","lifecycle","e2e","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
+        INTEGRATION_TEST_SUITE: ["raft","pvtdata","pvtdatapurge","ledger","lifecycle","e2e","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
     runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
     steps:
       - uses: actions/setup-go@v3

diff --git a/integration/nwo/template/core_template.go b/integration/nwo/template/core_template.go
@@ -64,7 +64,7 @@ peer:
       pushAckTimeout: 3s
       btlPullMargin: 10
       reconcileBatchSize: 10
-      reconcileSleepInterval: 10s
+      reconcileSleepInterval: 5s
       reconciliationEnabled: true
       skipPullingInvalidTransactionsDuringCommit: false
       implicitCollectionDisseminationPolicy:

diff --git a/integration/ports.go b/integration/ports.go
@@ -38,6 +38,7 @@ const (
 	PKCS11Port
 	PluggableBasePort
 	PrivateDataBasePort
+	PrivateDataPurgeBasePort
 	RaftBasePort
 	SBEBasePort
 )