Skip to content

Commit 75d73a5

Browse files
authored
Merge pull request EESSI#55 from TopRichard/nessi.no-2022.11-generic-rebuild
Added the initial 6 essential packages
2 parents 9331ad8 + d0a832e commit 75d73a5

2 files changed

Lines changed: 35 additions & 18 deletions

File tree

EESSI-pilot-install-software.sh

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,20 +225,20 @@ echo_green "All set, let's start installing some software in ${EASYBUILD_INSTALL
225225
# install Java with fixed custom easyblock that uses patchelf to ensure right glibc is picked up,
226226
# see https://github.com/EESSI/software-layer/issues/123
227227
# and https://github.com/easybuilders/easybuild-easyblocks/pull/2557
228-
#ok_msg="Java installed, off to a good (?) start!"
229-
#fail_msg="Failed to install Java, woopsie..."
230-
#$EB Java-11.eb --robot --include-easyblocks-from-pr 2557
231-
#check_exit_code $? "${ok_msg}" "${fail_msg}"
228+
ok_msg="Java installed, off to a good (?) start!"
229+
fail_msg="Failed to install Java, woopsie..."
230+
$EB Java-11.eb --robot --include-easyblocks-from-pr 2557
231+
check_exit_code $? "${ok_msg}" "${fail_msg}"
232232

233233
# install GCC for foss/2020a
234-
#export GCC_EC="GCC-9.3.0.eb"
235-
#echo ">> Starting slow with ${GCC_EC}..."
236-
#ok_msg="${GCC_EC} installed, yippy! Off to a good start..."
237-
#fail_msg="Installation of ${GCC_EC} failed!"
234+
export GCC_EC="GCC-9.3.0.eb"
235+
echo ">> Starting slow with ${GCC_EC}..."
236+
ok_msg="${GCC_EC} installed, yippy! Off to a good start..."
237+
fail_msg="Installation of ${GCC_EC} failed!"
238238
# pull in easyconfig from https://github.com/easybuilders/easybuild-easyconfigs/pull/14453,
239239
# which includes patch to fix build of GCC 9.3 when recent kernel headers are in place
240-
#$EB ${GCC_EC} --robot --from-pr 14453 GCCcore-9.3.0.eb
241-
#check_exit_code $? "${ok_msg}" "${fail_msg}"
240+
$EB ${GCC_EC} --robot --from-pr 14453 GCCcore-9.3.0.eb
241+
check_exit_code $? "${ok_msg}" "${fail_msg}"
242242

243243
# install CMake with custom easyblock that patches CMake when --sysroot is used
244244
#echo ">> Install CMake with fixed easyblock to take into account --sysroot"
@@ -463,6 +463,25 @@ echo_green "All set, let's start installing some software in ${EASYBUILD_INSTALL
463463
#$EB --last-log
464464
#cat $($EB --last-log)
465465
#check_exit_code $exit_code "${ok_msg}" "${fail_msg}"
466+
echo ">> Installing EasyBuild 4.6.2..."
467+
ok_msg="EasyBuild v4.6.2 installed"
468+
fail_msg="EasyBuild v4.6.2 failed to install"
469+
$EB --robot EasyBuild-4.6.2.eb
470+
check_exit_code $? "${ok_msg}" "${fail_msg}"
471+
472+
# install GCC for foss/2021a
473+
export GCC_EC="GCC-10.3.0.eb"
474+
echo ">> Starting slow with ${GCC_EC}..."
475+
ok_msg="${GCC_EC} installed, yippy! Off to a good start..."
476+
fail_msg="Installation of ${GCC_EC} failed!"
477+
$EB --robot GCCcore-10.3.0.eb
478+
check_exit_code $? "${ok_msg}" "${fail_msg}"
479+
480+
# install Java 17
481+
ok_msg="Java installed, off to a good (?) start!"
482+
fail_msg="Failed to install Java, woopsie..."
483+
$EB Java-17.eb --robot
484+
check_exit_code $? "${ok_msg}" "${fail_msg}"
466485

467486

468487
echo ">> Creating/updating Lmod cache..."

eessi-2022.11.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
easyconfigs:
2-
# - EasyBuild-4.7.0.eb
3-
# - CMake-3.20.1-GCCcore-10.3.0.eb
4-
# - Python-3.9.5-GCCcore-10.3.0.eb
5-
# - OpenMPI-4.1.1-GCC-10.3.0.eb
6-
# - ImageMagick-7.0.11-14-GCCcore-10.3.0.eb
7-
# - Nextflow-22.10.1.eb
8-
# - Qt5-5.14.1-GCCcore-9.3.0.eb
9-
# - Spark-3.1.1-foss-2020a-Python-3.8.2.eb
2+
- EasyBuild-4.6.2.eb
3+
- EasyBuild-4.7.0.eb
4+
- Java-11.eb
5+
- Java-17.eb
6+
- GCC-9.3.0.eb
7+
- GCC-10.3.0.eb

0 commit comments

Comments
 (0)