Fix for master build failure on FT ordering (#1433)

* Fix for master build failure on FT ordering * Changed to ordered * changed to DEFAULT_COLLECTION_ASSERTION_MODE=UNORDERED in jenkins nightly
hmcts · Dec 14, 2023 · ea42046 · ea42046
1 parent b1c9d46
commit ea42046
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
@@ -58,6 +58,8 @@ env.BEFTA_RETRY_STATUS_CODES = "500,502,503,504"
 env.BEFTA_RETRY_MAX_DELAY = "1000"
 env.BEFTA_RETRY_NON_RETRYABLE_HTTP_METHODS = "POST,PUT"
 
+env.DEFAULT_COLLECTION_ASSERTION_MODE="UNORDERED"
+
 withPipeline(type, product, app) {
     onMaster {
         enableSlackNotifications('#ccd-master-builds')

diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
@@ -56,6 +56,8 @@ env.BEFTA_RETRY_STATUS_CODES = "500,502,503,504"
 env.BEFTA_RETRY_MAX_DELAY = "1000"
 env.BEFTA_RETRY_NON_RETRYABLE_HTTP_METHODS = "POST,PUT"
 
+env.DEFAULT_COLLECTION_ASSERTION_MODE="UNORDERED"
+
 withNightlyPipeline(type, product, component) {
     // Vars needed for functional and smoke tests run against AKS
     env.OAUTH2_CLIENT_ID = "ccd_gateway"

diff --git a/aat/src/aat/resources/features/F-080/S-080.1.td.json b/aat/src/aat/resources/features/F-080/S-080.1.td.json
@@ -229,6 +229,10 @@
       ],
       "searchAliasFields": [],
       "roleToAccessProfiles": [
+        {
+          "__ordering__": "ORDERED",
+          "__elementId__": "case_type_id"
+        },
         {
           "case_type_id": "FT_CaseAccessCategories",
           "disabled": false,