Commit 97317f3f authored by Sebastian Achilles's avatar Sebastian Achilles
Browse files

Move common files into separate directory

parent 6af7a8d1
Pipeline #88372 failed with stages
in 3 minutes and 27 seconds
EB_PYTHON=/usr/bin/python3 eb --force-download --try-software-version $(date '+%Y%m%d') EasyBuild-develop.eb --prefix /scratch --installpath /easybuild && rm -rf /scratch/*
......@@ -9,7 +9,8 @@ FROM ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG}
ARG USER_ID
ARG GROUP_ID
# add EasyBuild-develop.eb
ADD EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/update-eb-dev.sh /home/easybuild/update-eb-dev.sh
USER root
RUN chown -R easybuild:easybuild /home/easybuild/EasyBuild-develop.eb
# install pep8, keyring, keyrings.alt, and GitPython
......
......@@ -9,7 +9,8 @@ FROM ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG}
ARG USER_ID
ARG GROUP_ID
# add EasyBuild-develop.eb
ADD EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/update-eb-dev.sh /home/easybuild/update-eb-dev.sh
USER root
RUN chown -R easybuild:easybuild /home/easybuild/EasyBuild-develop.eb
# install pep8, keyring, keyrings.alt, and GitPython
......
# to install, use: eb --force-download --try-software-version $(date '+%Y%m%d') EasyBuild-develop.eb
easyblock = 'EB_EasyBuildMeta'
name = 'EasyBuild'
version = '0.0.0'
versionsuffix = '-dev'
homepage = 'https://easybuilders.github.io/easybuild'
description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
toolchain = SYSTEM
sources = [
{
'source_urls': ['https://github.com/easybuilders/easybuild-framework/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-framework-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyblocks/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyblocks-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyconfigs/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyconfigs-develop.tar.gz',
},
]
# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
# EasyBuild is a (set of) Python packages, so it depends on Python
# usually, we want to use the system Python, so no actual Python dependency is listed
allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
sanity_check_paths = {
'files': ['bin/eb'],
'dirs': ['lib/python%s/site-packages' % local_pyshortver],
}
moduleclass = 'tools'
......@@ -9,7 +9,8 @@ FROM ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG}
ARG USER_ID
ARG GROUP_ID
# add EasyBuild-develop.eb
ADD EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/update-eb-dev.sh /home/easybuild/update-eb-dev.sh
USER root
RUN chown -R easybuild:easybuild /home/easybuild/EasyBuild-develop.eb
# install pep8, keyring, keyrings.alt, and GitPython
......
# to install, use: eb --force-download --try-software-version $(date '+%Y%m%d') EasyBuild-develop.eb
easyblock = 'EB_EasyBuildMeta'
name = 'EasyBuild'
version = '0.0.0'
versionsuffix = '-dev'
homepage = 'https://easybuilders.github.io/easybuild'
description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
toolchain = SYSTEM
sources = [
{
'source_urls': ['https://github.com/easybuilders/easybuild-framework/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-framework-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyblocks/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyblocks-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyconfigs/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyconfigs-develop.tar.gz',
},
]
# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
# EasyBuild is a (set of) Python packages, so it depends on Python
# usually, we want to use the system Python, so no actual Python dependency is listed
allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
sanity_check_paths = {
'files': ['bin/eb'],
'dirs': ['lib/python%s/site-packages' % local_pyshortver],
}
moduleclass = 'tools'
......@@ -9,7 +9,8 @@ FROM ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG}
ARG USER_ID
ARG GROUP_ID
# add EasyBuild-develop.eb
ADD EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/update-eb-dev.sh /home/easybuild/update-eb-dev.sh
USER root
RUN chown -R easybuild:easybuild /home/easybuild/EasyBuild-develop.eb
# install pep8, keyring, keyrings.alt, and GitPython
......
# to install, use: eb --force-download --try-software-version $(date '+%Y%m%d') EasyBuild-develop.eb
easyblock = 'EB_EasyBuildMeta'
name = 'EasyBuild'
version = '0.0.0'
versionsuffix = '-dev'
homepage = 'https://easybuilders.github.io/easybuild'
description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
toolchain = SYSTEM
sources = [
{
'source_urls': ['https://github.com/easybuilders/easybuild-framework/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-framework-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyblocks/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyblocks-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyconfigs/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyconfigs-develop.tar.gz',
},
]
# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
# EasyBuild is a (set of) Python packages, so it depends on Python
# usually, we want to use the system Python, so no actual Python dependency is listed
allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
sanity_check_paths = {
'files': ['bin/eb'],
'dirs': ['lib/python%s/site-packages' % local_pyshortver],
}
moduleclass = 'tools'
......@@ -6,7 +6,8 @@ ARG IMG_TAG=latest
# allow CI/CD to change all of the above
FROM ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG}
# add EasyBuild-develop.eb
ADD EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/EasyBuild-develop.eb /home/easybuild/EasyBuild-develop.eb
ADD ../01common/update-eb-dev.sh /home/easybuild/update-eb-dev.sh
# install pep8
USER root
RUN pip3 install pep8
......
# to install, use: eb --force-download --try-software-version $(date '+%Y%m%d') EasyBuild-develop.eb
easyblock = 'EB_EasyBuildMeta'
name = 'EasyBuild'
version = '0.0.0'
versionsuffix = '-dev'
homepage = 'https://easybuilders.github.io/easybuild'
description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
toolchain = SYSTEM
sources = [
{
'source_urls': ['https://github.com/easybuilders/easybuild-framework/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-framework-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyblocks/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyblocks-develop.tar.gz',
},
{
'source_urls': ['https://github.com/easybuilders/easybuild-easyconfigs/archive/'],
'download_filename': 'develop.tar.gz',
'filename': 'easybuild-easyconfigs-develop.tar.gz',
},
]
# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
# EasyBuild is a (set of) Python packages, so it depends on Python
# usually, we want to use the system Python, so no actual Python dependency is listed
allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
sanity_check_paths = {
'files': ['bin/eb'],
'dirs': ['lib/python%s/site-packages' % local_pyshortver],
}
moduleclass = 'tools'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment