Merge remote-tracking branch 'origin/main'

datacore.yml

@@ -130,13 +130,13 @@ ImportIntoDatacore:
   tags:
     - deploylocal
   needs:
-    - job: PrepareImport
+    - job: Prepare Import
   before_script: !reference [.prepareaccess, before_script]
   script:
     - cd /data/${CI_COMMIT_REF_NAME}
     - dc exec app curl --fail -X POST http://localhost:4100/api/import/basic
     - dc exec app curl --fail -X POST http://localhost:4100/api/import/realestate
-    - if [[ "DATACORE_IMPORT_INTERNAL_USERS" == "yes ]]; then dc exec app curl --fail -X POST http://localhost:4100/api/import/internalusers; fi
+    - dc exec app curl --fail -X POST http://localhost:4100/api/import/internalusers
   variables:
     GIT_STRATEGY: none
   cache: {}
@@ -179,7 +179,7 @@ XRM Check New Users:
   before_script: !reference [.prepareaccess, before_script]
   script:
     - cd /data/${CI_COMMIT_REF_NAME}
-    - dc exec app curl --fail -X POST http://localhost:4000/api/import/newusers >/dev/null 2>&1
+    - dc exec app curl --fail -X POST http://localhost:4100/api/import/newusers >/dev/null 2>&1
 
 XRM Sync:
   stage: build
@@ -197,7 +197,7 @@ XRM Sync:
   before_script: !reference [.prepareaccess, before_script]
   script:
     - cd /data/${CI_COMMIT_REF_NAME}
-    - dc exec app curl --fail -X POST http://localhost:4000/api/import/sync >/dev/null 2>&1
+    - dc exec app curl --fail -X POST http://localhost:4100/api/import/sync >/dev/null 2>&1
 
 Push Changes:
   stage: postprocess