Update CI/CD files

.gitlab-ci.yml

-<<<<<<< HEAD
-
-
-.project-build:
-  after_script:
-    - "## End of script."
-
-.project-test:
-  after_script:
-    - "## End of script."
-
-.project-deploy:
-  after_script:
-    - "## End of script."
-
-# include:
-#   - project: 'accelerators/cicd/ci-cd/ds-project-template'
-#     ref: rev1
-#     file: '/build_project.yml'
-
-
-################################################################################################
-################################################################################################
-################################################################################################
-
-variables:
-    REPO_DOCKER_IMG: gitlab-registry.esrf.fr/accelerators/cicd/ci-cd/tango-img
-    REPO_FS: segsrv.esrf.fr:/segfs/tango/release_gitlab/os/${OS_FS}
-    REPO_FS_PATH: /opt/os_dev
-=======
 # This CI/CD Gitlab file include a centralized CI file : build_project.yml, frm local project : accelerators/cicd/ci-cd/ds-project-template, branch : rev1
 # This centralized CI file load itself specific other file by OS which contain finale job to execute.
 # You can override directives merge by these included file with the "masked job" below which are included by the main jobs.
@@ -38,244 +8,8 @@ variables:
 #  script:
 #   - !reference [.common-build, script]
 #   - ls -la ...  
->>>>>>> develop
-
-
-<<<<<<< HEAD
-###############################################################################
-# To specifiy Gitlab unner which have docker engine available
-.common-job:
-  image: 
-    name: ${REPO_DOCKER_IMG}/${OS_IMG}:9.3.5
-  tags:
-    - docker
-  
-
-###############################################################################
-# Give target folder en CMake var depending Debug or Release version
-.common-debug:
-  variables:
-    BUILD_TYPE: Debug
-    INSTALL_DIR: ${REPO_FS_PATH}/debug
-
-.common-release:
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    INSTALL_DIR: ${REPO_FS_PATH}/release
-
-###############################################################################
-.common-build:
-  stage: build
-  script:
-    - env
-    
-    #- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
-    #- make -j
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: manual
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
-
-###############################################################################
-.common-test:
-  stage: test
-  script:
-    - env
-
-    #- sudo mkdir -p ${REPO_FS_PATH}
-    #- sudo chmod 777 ${REPO_FS_PATH}
-    #- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
-    #- make -j
-    #- make install
-    #- tree -Ca ${REPO_FS_PATH}
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
-
-###############################################################################
-.common-deploy:
-  stage: deploy
-  script:
-    - env
-
-    - sudo apt install nfs-common
-    - sudo mount ${REPO_FS} ${REPO_FS_PATH}
-    - ls -la ${REPO_FS_PATH}/
-    # - '[[ -d ${INSTALL_DIR}/lib/classes ]]
-    #- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
-    #- make -j
-    #- make install
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "release" && $CI_COMMIT_TAG =~ /^\d+\.\d+\.x$/'
-      when: manual
-  # release:
-  #   name: 'Release $CI_COMMIT_TAG'
-  #   description: 'Release created using the release-cli.'
-
-
-
-
-
-
-
-################################################################################################
-################################################################################################
-################################################################################################
-
-
-.common-debian9:
-  variables:
-    OS_IMG: debian9
-    OS_FS: debian9
-  
-
-# DEBUG        ################
-
-debian9:debug:build:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-debug
-    - .common-build
-    - .project-build
-
-debian9:debug:test:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-debug
-    - .common-test
-    - .project-test
-  needs:
-    - job: debian9:debug:build
-      artifacts: true
-
-debian9:debug:deploy:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-debug
-    - .common-deploy
-    - .project-deploy
-  needs:
-    - job: debian9:debug:build
-      artifacts: true
-
-
-# RELEASE      ################
-
-debian9:release:build:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-release
-    - .common-build
-    - .project-build
-
-debian9:release:test:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-release
-    - .common-test
-    - .project-test
-  needs:
-    - job: debian9:release:build
-      artifacts: true
-
-debian9:release:deploy:
-  extends:
-    - .common-job
-    - .common-debian9
-    - .common-release
-    - .common-deploy
-    - .project-deploy
-  needs:
-    - job: debian9:release:build
-      artifacts: true
-
-
-
-
-
-################################################################################################
-################################################################################################
-################################################################################################
-
-.common-ubuntu20:
-  variables:
-    OS_IMG: ubuntu20
-    OS_FS: ubuntu20.04
-
-
-# DEBUG        ################
-
-ubuntu20:debug:build:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-debug
-    - .common-build
-    - .project-build
-
-ubuntu20:debug:test:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-debug
-    - .common-test
-    - .project-test
-  needs:
-    - job: ubuntu20:debug:build
-      artifacts: true
-
-ubuntu20:debug:deploy:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-debug
-    - .common-deploy
-    - .project-deploy
-  needs:
-    - job: ubuntu20:debug:build
-      artifacts: true
-
-
-# RELEASE      ################
-
-ubuntu20:release:build:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-release
-    - .common-build
-    - .project-build
-
-ubuntu20:release:test:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-release
-    - .common-test
-    - .project-test
-  needs:
-    - job: ubuntu20:release:build
-      artifacts: true
 
-ubuntu20:release:deploy:
-  extends:
-    - .common-job
-    - .common-ubuntu20
-    - .common-release
-    - .common-deploy
-    - .project-deploy
-  needs:
-    - job: ubuntu20:release:build
-      artifacts: true
-  
 
-=======
 .project-build:
   after_script:
     - "## End of script."
@@ -293,4 +27,3 @@ include:
     ref: 'tango_9.3'
     file: 'build_project.yml'
 
->>>>>>> develop