Skip to content
Snippets Groups Projects
Commit 4c97988a authored by Administrator's avatar Administrator
Browse files

Switch VM runtime

Use qemu instead of VirtualBox to execute the virtual machines.
The advantage is a much faster and reliable startup of the VMs.
With VirtualBox the image needs to be copied as well there were sometimes
problems with the ssh connection to a running machine.
With qemu the copy of the image isn't needed and no ssh problems were
seen yet.
parent 7f86fb79
No related branches found
No related tags found
1 merge request!823Switch VM runtime
Pipeline #17268 passed
......@@ -207,42 +207,6 @@ FileLicenceCheck:
tags:
- CbmRoot_singularity
#.singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19
# OS: debian10
# FAIRSOFT_VERSION: jun19p2
# FAIRROOT_VERSION: v18.2.1
# BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
#.singularity_debian8_variables_jun19: &singularity_debian8_variables_jun19
# OS: debian8
# FAIRSOFT_VERSION: jun19p2
# FAIRROOT_VERSION: v18.2.1
# BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
# CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment.sh"
#.singularity_debian8_variables_nov20: &singularity_debian8_variables_nov20
# OS: debian8
# FAIRSOFT_VERSION: nov20
# FAIRROOT_VERSION: v18.4.2
# BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
# CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment.sh"
#.singularity_debian8_variables_apr21: &singularity_debian8_variables_apr21
# OS: debian8
# FAIRSOFT_VERSION: apr21
# FAIRROOT_VERSION: v18.6.3
# BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft_${FAIRSOFT_VERSION}"
# CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment.sh"
.singularity_debian10_variables_apr21: &singularity_debian10_variables_apr21
OS: debian10
FAIRSOFT_VERSION: apr21p2
......@@ -285,58 +249,41 @@ FileLicenceCheck:
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
#.macosx_tag: &macosx_tag
# stage: build
# tags:
# - CbmRoot_macosx
#.macosx_variables: &macosx_variables
# OS: "macOS_10.13"
# NCPU: 4
# FAIRSOFT_VERSION: "jun19p1"
# FAIRROOT_VERSION: "v18.2.1"
# BASE_PATH: "/opt"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
#.macosx_1015_tag: &macosx_1015_tag
# stage: build
# tags:
# - CbmRoot_macosx_1015
#.macosx_1015_variables: &macosx_1015_variables
# OS: "macOS_10.15"
# FAIRSOFT_VERSION: "jun19p1"
# FAIRROOT_VERSION: "v18.2.1"
# BASE_PATH: "/opt"
# SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
# FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
.macosx_11_tag: &macosx_11_tag
.macosx_tag: &macosx_tag
stage: build
tags:
- CbmRoot_macosx_11
- qemu_macosx
.macosx_11_variables: &macosx_11_variables
OS: "macOS_11"
.macosx_12_variables: &macosx_12_variables
OS: "macOS12"
FAIRSOFT_VERSION: "apr21p2"
FAIRROOT_VERSION: "v18.6.7"
BASE_PATH: "/opt"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
EXTRA_PATH: /usr/local/bin
.macosx_12_tag: &macosx_12_tag
stage: build
tags:
- CbmRoot_macosx_12
.macosx_11_variables: &macosx_11_variables
OS: "macOS11"
FAIRSOFT_VERSION: "apr21p2"
FAIRROOT_VERSION: "v18.6.7"
BASE_PATH: "/opt"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
EXTRA_PATH: /usr/local/bin
.macosx_12_variables: &macosx_12_variables
OS: "macOS_12"
.macosx_1015_variables: &macosx_1015_variables
OS: "macOS1015"
FAIRSOFT_VERSION: "apr21p2"
FAIRROOT_VERSION: "v18.6.7"
BASE_PATH: "/opt"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
EXTRA_PATH: /usr/local/bin
.mergeVariables: &mergeVariables
BUILD_TYPE: "Continuous"
......@@ -367,26 +314,6 @@ CbmRoot_Merge_realData:
variables:
<<: [*mergeRequestVariables, *realData_variables]
#CbmRoot_Merge_Singularity_debian10_jun19:
# <<: [*singularity_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19]
#CbmRoot_Merge_Singularity_debian8_jun19:
# <<: [*singularity_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *singularity_debian8_variables_jun19]
#CbmRoot_Merge_Singularity_debian8_nov20:
# <<: [*singularity_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *singularity_debian8_variables_nov20]
#CbmRoot_Merge_Singularity_debian8_apr21:
# <<: [*singularity_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *singularity_debian8_variables_apr21]
CbmRoot_Merge_Singularity_debian10_apr21:
<<: [*singularity_tag, *check_merge_request, *build_and_test]
variables:
......@@ -402,30 +329,20 @@ CbmRoot_Merge_Singularity_centos7_apr21:
variables:
<<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
#CbmRoot_Merge:
# <<: [*linux_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *linux_variables]
#CbmRoot_Merge_macosx:
# <<: [*macosx_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *macosx_variables]
#CbmRoot_Merge_macosx_1015:
# <<: [*macosx_1015_tag, *check_merge_request, *build_and_test]
# variables:
# <<: [*mergeRequestVariables, *macosx_1015_variables]
CbmRoot_Merge_macosx_12:
<<: [*macosx_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *macosx_12_variables]
CbmRoot_Merge_macosx_11:
<<: [*macosx_11_tag, *check_merge_request, *build_and_test]
<<: [*macosx_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *macosx_11_variables]
CbmRoot_Merge_macosx_12:
<<: [*macosx_12_tag, *check_merge_request, *build_and_test]
CbmRoot_Merge_macosx_1015:
<<: [*macosx_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *macosx_12_variables]
<<: [*mergeRequestVariables, *macosx_1015_variables]
CbmRoot_Continuous:
<<: [*linux_tag, *check_merge, *build_and_test]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment