Change branches and update setup pipeline

.ci-scripts/setup-integration-test.yml

@@ -24,24 +24,26 @@ setup-integration-test:
   - git config --global http.sslVerify false # CAUTION: unsecure! Find another way
 
   ## Clean up and clone
-  - if [ -d "${DIR_UNICADO}" ]; then  rm -rf ${DIR_UNICADO}; fi
-  - if [ -d "${DIR_DESIGN_EVALUATOR}" ]; then  rm -rf ${DIR_DESIGN_EVALUATOR}; fi
-  - if [ -d "${DIR_PROJECTS}" ]; then  rm -rf ${DIR_PROJECTS}; fi
-  - git clone --recurse-submodules $GIT_REPO_URL ${DIR_UNICADO} --branch ${BRANCH_UNICADO}
-  - cd ${PATH_CLEAN_AIRCRAFT_DESIGN} && git checkout ${BRANCH_AIRCRAFT_DESIGN} && cd ${DIR_SUBMODULE_LIBS} && git checkout ${BRANCH_LIBRARIES}
-  - cd ${PATH_CLEAN_ADDITIONAL_SOFTWARE} && git checkout ${BRANCH_ADDITIONAL_SOFTWARE} && cd ${DIR_SUBMODULE_LIBS} && git checkout ${BRANCH_LIBRARIES}
-  - cd ${PATH_CLEAN_AIRCRAFT_REFERENCES} && git checkout ${BRANCH_AIRCRAFT_REFERENCES}
-  - cd ${PATH_CLEAN_LIBRARIES} && git checkout ${BRANCH_LIBRARIES} && cd ${CI_PROJECT_DIR}
+  #- if [ -d "${DIR_UNICADO}" ]; then  rm -rf ${DIR_UNICADO}; fi
+  #- if [ -d "${DIR_DESIGN_EVALUATOR}" ]; then  rm -rf ${DIR_DESIGN_EVALUATOR}; fi
+  #- if [ -d "${DIR_PROJECTS}" ]; then  rm -rf ${DIR_PROJECTS}; fi
+  - git clone $GIT_REPO_URL ${DIR_UNICADO} --branch ${BRANCH_UNICADO}
+  #- cd ${PATH_CLEAN_AIRCRAFT_DESIGN} && git checkout ${BRANCH_AIRCRAFT_DESIGN} && cd ${DIR_SUBMODULE_LIBS} && git checkout ${BRANCH_LIBRARIES}
+  #- cd ${PATH_CLEAN_ADDITIONAL_SOFTWARE} && git checkout ${BRANCH_ADDITIONAL_SOFTWARE} && cd ${DIR_SUBMODULE_LIBS} && git checkout ${BRANCH_LIBRARIES}
+  #- cd ${PATH_CLEAN_AIRCRAFT_REFERENCES} && git checkout ${BRANCH_AIRCRAFT_REFERENCES}
+  #- cd ${PATH_CLEAN_LIBRARIES} && git checkout ${BRANCH_LIBRARIES} && cd ${CI_PROJECT_DIR}
 
 
   ## If needed - checkout other lib version
   ## Caution: the merge request shall work with the provided libraries, 
   ## otherwise a submodule update shall be commited as well
-  - rm -rf ${DIR_SUBMODULE_LIBS}
+  #- rm -rf ${DIR_SUBMODULE_LIBS}
+  - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@git.rwth-aachen.de/".insteadOf "ssh://git@git.rwth-aachen.de/"
+  - git submodule sync
   - git submodule update --init --recursive
-  - cd ${DIR_SUBMODULE_LIBS}
-  - git checkout ${BRANCH_LIBRARIES}
-  - cd ${CI_PROJECT_DIR}
+  #- cd ${DIR_SUBMODULE_LIBS}
+  #- git checkout ${BRANCH_LIBRARIES}
+  #- cd ${CI_PROJECT_DIR}
 
   ## Detect modified tool
   ## List all changed folders

.ci-scripts/variables.yml

@@ -41,7 +41,7 @@ variables:
   PATH_WORKFLOW_INSTALL: ${CI_PROJECT_DIR}/UNICADOworkflow
 
   ## Branches to be checked out for clean repo
-  BRANCH_UNICADO: "main"
+  BRANCH_UNICADO: "develop"
   BRANCH_AIRCRAFT_DESIGN: "develop"
   BRANCH_ADDITIONAL_SOFTWARE: "develop"
   BRANCH_LIBRARIES: "develop"