Merge branch 'merge-to-mock-main-jh-2' into 'main-jh'

Add MERGE_OPTION  and merge to mock main JH

See merge request !20

.gitlab-ci.yml

@@ -19,6 +19,7 @@ default:
   variables:
     MERGE_FROM: master
     MERGE_INTO: main-jh
+    MERGE_OPTION: --ff
   rules:
     - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $JH_SYNC_SCHEDULE == $CI_JOB_NAME'
     - when: manual
@@ -39,7 +40,7 @@ default:
       if [ "$CI_JOB_NAME" = "gitlab-pre-main-jh" ]; then
         [[ ! -z "$MERGE_FROM_JH" ]] && git merge "origin/${MERGE_FROM_JH}"
       fi
-    - git merge "origin/${MERGE_FROM}"
+    - git merge "origin/${MERGE_FROM} ${MERGE_OPTION}"
     - |
       if [ "$CI_JOB_NAME" = "gitlab" ] || [ "$CI_JOB_NAME" = "gitlab-pre-main-jh" ]; then
         git checkout "origin/${MERGE_FROM}" .gitattributes
@@ -87,6 +88,14 @@ gitlab-pre-main-jh:
     MERGE_FROM_JH: main-jh
     MERGE_INTO: pre-main-jh
 
+gitlab-main-jh:
+  extends:
+    - gitlab
+  variables:
+    MERGE_FROM: pre-main-jh
+    MERGE_INTO: mock-main-jh
+    MERGE_OPTION: --ff-only
+
 runner:
   extends:
     - .sync