Merge branch 'master' into master

Author: Nortamo

configs/lumi.yaml

@@ -12,7 +12,7 @@ defaults:
     composable: true
     # if this is not a thing which exist
     # I will do a singularity pull
-    container_src: 'docker://opensuse/leap:15.4'
+    container_src: 'docker://opensuse/leap:15.5'
     # name of the container image when on disk
     container_image: container.sif 
     sqfs_image: img.sqfs 

configs/mahti.yaml

@@ -12,7 +12,7 @@ defaults:
     composable: true
     # if this is not a thing which exist
     # I will do a singularity pull
-    container_src: 'docker://redhat/ubi8:8.6' 
+    container_src: 'docker://redhat/ubi8:8.10' 
     # name of the container image when on disk
     container_image: container.sif 
     sqfs_image: img.sqfs 

frontends/containerize

@@ -68,7 +68,7 @@ fi
 
 source $CW_BUILD_TMPDIR/_vars.sh
 if [[ ! -d "$CW_INSTALLATION_PREFIX" ]];then
-    print_info "Installation dir $CW_INSTALLATION_PREFIX does not exist, creating it for you"
+    print_info "Installation dir $CW_INSTALLATION_PREFIX does not exist, creating it for you" 1
     mkdir -p "$CW_INSTALLATION_PREFIX"
 fi
 if [[ ! -w "$CW_INSTALLATION_PREFIX" || ! -x "$CW_INSTALLATION_PREFIX" ]];then

templates/conda.sh

@@ -17,9 +17,11 @@ curl -sL https://github.com/conda-forge/miniforge/releases/download/$CW_CONDA_VE
 print_info "Installing miniforge " 1
 bash Miniforge_inst.sh -b -p $CW_INSTALLATION_PATH/miniforge > $CW_BUILD_TMPDIR/_inst_miniforge.log &
 inst_pid=$!
-follow_log $inst_pid $CW_BUILD_TMPDIR/_inst_miniforge.log 10
+
+follow_log $inst_pid $CW_BUILD_TMPDIR/_inst_miniforge.log 20
 rm Miniforge_inst.sh
 eval "$($CW_INSTALLATION_PATH/miniforge/bin/conda shell.bash hook)"
+
 cd $CW_WORKDIR
 source $CW_INSTALLATION_PATH/_pre_install.sh
 if [[ ! -z "$(echo "$CW_ENV_FILE" | grep ".*\.yaml\|.*\.yml")" ]];then 
@@ -39,7 +41,7 @@ else
 fi
 
 inst_pid=$!
-follow_log $inst_pid $CW_BUILD_TMPDIR/build.log 10  
+follow_log $inst_pid $CW_BUILD_TMPDIR/build.log 20 
 wait $inst_pid
 conda activate $CW_ENV_NAME
 if [[ ${CW_REQUIREMENTS_FILE+defined}  ]];then

templates/conda_modify.sh

@@ -13,7 +13,7 @@ if [[ ${CW_REQUIREMENTS_FILE+defined}  ]];then
     pip install -r $( basename "$CW_REQUIREMENTS_FILE" )  > $CW_BUILD_TMPDIR/_pip.log &
     bg_pid=$!
     wait $bg_pid
-    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 10
+    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 20
 fi
 cd $CW_WORKDIR
 source $CW_INSTALLATION_PATH/_post_install.sh

templates/venv.sh

@@ -29,7 +29,7 @@ if [[ ${CW_REQUIREMENTS_FILE+defined}  ]];then
     pip install --disable-pip-version-check -r "$( basename $CW_REQUIREMENTS_FILE)" > $CW_BUILD_TMPDIR/_pip.log &
     bg_pid=$!
     wait $bg_pid
-    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 10
+    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 20
 fi
 cd $CW_WORKDIR
 print_info "Running user supplied commands" 1

templates/venv_modify.sh

@@ -19,7 +19,7 @@ if [[ ${CW_REQUIREMENTS_FILE+defined}  ]];then
     pip install --disable-pip-version-check -r "$( basename $CW_REQUIREMENTS_FILE)" > $CW_BUILD_TMPDIR/_pip.log &
     bg_pid=$!
     wait $bg_pid
-    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 10
+    follow_log $bg_pid $CW_BUILD_TMPDIR/_pip.log 20
 fi
 cd $CW_WORKDIR
 #print_info "Running user supplied commands" 1

tests/tests.sh

@@ -55,7 +55,7 @@ dependencies:
 " > conda_broken.yaml
 echo "GARBAGE" > conda_env.txt
 
-t_run "conda-containerize new conda_base.yml --prefix NOT_A_DIR | grep ERROR" "Missing install dir causes error"
+t_run "conda-containerize new conda_base.yml --prefix NOT_A_DIR" "Missing install dir is created"
 mkdir A_DIR_NO_WRITE
 chmod ugo-w A_DIR_NO_WRITE
 t_run "conda-containerize new conda_base.yml --prefix A_DIR_NO_WRITE | grep ERROR" "Installation dir has to be writable"