Longer context

CSCfi · Sep 19, 2024 · d68fd47 · d68fd47
1 parent 0d9cea8
commit d68fd47
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/configs/mahti.yaml b/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 

diff --git a/templates/conda.sh b/templates/conda.sh
@@ -16,7 +16,7 @@ curl https://repo.anaconda.com/miniconda/Miniconda3-$CW_CONDA_VERSION-$CW_CONDA_
 print_info "Installing miniconda " 1 
 bash Miniconda_inst.sh -b -p $CW_INSTALLATION_PATH/miniconda  > $CW_BUILD_TMPDIR/_inst_miniconda.log &   
 inst_pid=$!
-follow_log $inst_pid $CW_BUILD_TMPDIR/_inst_miniconda.log 10
+follow_log $inst_pid $CW_BUILD_TMPDIR/_inst_miniconda.log 20
 rm Miniconda_inst.sh
 eval "$($CW_INSTALLATION_PATH/miniconda/bin/conda shell.bash hook)"
 cd $CW_WORKDIR
@@ -39,7 +39,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

diff --git a/templates/conda_modify.sh b/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

diff --git a/templates/venv.sh b/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

diff --git a/templates/venv_modify.sh b/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

diff --git a/tests/tests.sh b/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"