Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove references to 'pilot', switch to software.eessi.io #229

Merged
merged 3 commits into from
Nov 26, 2023
Merged

remove references to 'pilot', switch to software.eessi.io #229

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c47156
remove references to 'pilot', switch to software.eessi.io
truib Nov 15, 2023
4ab2dcd
support defaults for EESSI pilot and software.eessi.io
trz42 Nov 26, 2023
d05dedb
fix changed CernVM-FS config for software.eessi.io
trz42 Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,10 @@ repos_cfg_dir = PATH_TO_SHARED_DIRECTORY/cfg_bundles
The `repos.cfg` file also uses the `ini` format as follows
```ini
[eessi-2023.06]
repo_name = pilot.eessi-hpc.org
repo_name = software.eessi.io
repo_version = 2023.06
config_bundle = eessi-hpc.org-cfg_files.tgz
config_map = { "eessi-hpc.org/cvmfs-config.eessi-hpc.org.pub":"/etc/cvmfs/keys/eessi-hpc.org/cvmfs-config.eessi-hpc.org.pub", "eessi-hpc.org/ci.eessi-hpc.org.pub":"/etc/cvmfs/keys/eessi-hpc.org/ci.eessi-hpc.org.pub", "eessi-hpc.org/pilot.eessi-hpc.org.pub":"/etc/cvmfs/keys/eessi-hpc.org/pilot.eessi-hpc.org.pub", "default.local":"/etc/cvmfs/default.local", "eessi-hpc.org.conf":"/etc/cvmfs/domain.d/eessi-hpc.org.conf"}
config_bundle = eessi.io-cfg_files.tgz
config_map = {"eessi.io/cvmfs-config.eessi.io.pub":"/etc/cvmfs/keys/eessi.io/cvmfs-config.eessi.io.pub", "eessi.io/ci.eessi.io.pub":"/etc/cvmfs/keys/eessi.io/ci.eessi.io.pub", "eessi.io/software.eessi.io.pub":"/etc/cvmfs/keys/eessi.io/software.eessi.io.pub", "default.local":"/etc/cvmfs/default.local", "eessi.io.conf":"/etc/cvmfs/domain.d/eessi.io.conf"}
container = docker://ghcr.io/eessi/build-node:debian11
```
The repository id is given in brackets (`[eessi-2023.06]`). Then the name of the repository (`repo_name`) and the
Expand Down
2 changes: 1 addition & 1 deletion app.cfg.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ arch_target_map = { "linux/x86_64/generic" : "--constraint shape=c4.2xlarge", "l
# EESSI/2021.12 and NESSI/2022.11
repo_target_map = { "linux/x86_64/amd/zen2" : ["eessi-2021.12","nessi.no-2022.11"] }

# points to definition of repositories (default EESSI-pilot defined by build container)
# points to definition of repositories (default repository defined by build container)
repos_cfg_dir = PATH_TO_SHARED_DIRECTORY/cfg_bundles


Expand Down
6 changes: 3 additions & 3 deletions tasks/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,9 @@ def prepare_jobs(pr, cfg, event_info, action_filter):
log(f"{fn}(): skipping arch {arch} because repo target map does not define repositories to build for")
continue
for repo_id in repocfg[REPO_TARGET_MAP][arch]:
# ensure repocfg contains information about the repository repo_id if repo_id != EESSI-pilot
# Note, EESSI-pilot is a bad/misleading name, it should be more like AS_IN_CONTAINER
if repo_id != "EESSI-pilot" and repo_id not in repocfg:
# ensure repocfg contains information about the repository repo_id if repo_id != EESSI
# Note, EESSI is a bad/misleading name, it should be more like AS_IN_CONTAINER
if (repo_id != "EESSI" and repo_id != "EESSI-pilot") and repo_id not in repocfg:
log(f"{fn}(): skipping repo {repo_id}, it is not defined in repo config {repocfg[REPOS_CFG_DIR]}")
continue

Expand Down
20 changes: 10 additions & 10 deletions tests/test_task_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def test_create_pr_comment_succeeds(mocked_github, tmpdir):
print("CREATING PR COMMENT")
ym = datetime.today().strftime('%Y.%m')
pr_number = 1
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed-up", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed-up", ym, pr_number)

job_id = "123"
app_name = "pytest"
Expand Down Expand Up @@ -309,7 +309,7 @@ def test_create_pr_comment_succeeds_none(mocked_github, tmpdir):
print("CREATING PR COMMENT")
ym = datetime.today().strftime('%Y.%m')
pr_number = 1
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed-up", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed-up", ym, pr_number)

job_id = "123"
app_name = "pytest"
Expand All @@ -334,7 +334,7 @@ def test_create_pr_comment_raises_once_then_succeeds(mocked_github, tmpdir):
print("CREATING PR COMMENT")
ym = datetime.today().strftime('%Y.%m')
pr_number = 1
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed-up", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed-up", ym, pr_number)

job_id = "123"
app_name = "pytest"
Expand All @@ -359,7 +359,7 @@ def test_create_pr_comment_always_raises(mocked_github, tmpdir):
print("CREATING PR COMMENT")
ym = datetime.today().strftime('%Y.%m')
pr_number = 1
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed-up", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed-up", ym, pr_number)

job_id = "123"
app_name = "pytest"
Expand All @@ -385,7 +385,7 @@ def test_create_pr_comment_three_raises(mocked_github, tmpdir):
print("CREATING PR COMMENT")
ym = datetime.today().strftime('%Y.%m')
pr_number = 1
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed-up", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed-up", ym, pr_number)

job_id = "123"
app_name = "pytest"
Expand All @@ -407,7 +407,7 @@ def test_create_read_metadata_file(mocked_github, tmpdir):
# create some test data
ym = datetime.today().strftime('%Y.%m')
pr_number = 999
job = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed_up_job", ym, pr_number)
job = Job(tmpdir, "test/architecture", "EESSI", "--speed_up_job", ym, pr_number)

job_id = "123"

Expand Down Expand Up @@ -438,14 +438,14 @@ def test_create_read_metadata_file(mocked_github, tmpdir):

# use directory that does not exist
dir_does_not_exist = os.path.join(tmpdir, "dir_does_not_exist")
job2 = Job(dir_does_not_exist, "test/architecture", "EESSI-pilot", "--speed_up_job", ym, pr_number)
job2 = Job(dir_does_not_exist, "test/architecture", "EESSI", "--speed_up_job", ym, pr_number)
job_id2 = "222"
with pytest.raises(FileNotFoundError):
create_metadata_file(job2, job_id2, pr_comment)

# use directory without write permission
dir_without_write_perm = os.path.join("/")
job3 = Job(dir_without_write_perm, "test/architecture", "EESSI-pilot", "--speed_up_job", ym, pr_number)
job3 = Job(dir_without_write_perm, "test/architecture", "EESSI", "--speed_up_job", ym, pr_number)
job_id3 = "333"
with pytest.raises(OSError):
create_metadata_file(job3, job_id3, pr_comment)
Expand All @@ -455,7 +455,7 @@ def test_create_read_metadata_file(mocked_github, tmpdir):

# use undefined values for parameters
# job_id = None
job4 = Job(tmpdir, "test/architecture", "EESSI-pilot", "--speed_up_job", ym, pr_number)
job4 = Job(tmpdir, "test/architecture", "EESSI", "--speed_up_job", ym, pr_number)
job_id4 = None
create_metadata_file(job4, job_id4, pr_comment)

Expand All @@ -470,7 +470,7 @@ def test_create_read_metadata_file(mocked_github, tmpdir):

# use undefined values for parameters
# job.working_dir = None
job5 = Job(None, "test/architecture", "EESSI-pilot", "--speed_up_job", ym, pr_number)
job5 = Job(None, "test/architecture", "EESSI", "--speed_up_job", ym, pr_number)
job_id5 = "555"
with pytest.raises(TypeError):
create_metadata_file(job5, job_id5, pr_comment)
6 changes: 3 additions & 3 deletions tests/test_tools_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_match_architecture_job_context(complex_filter):


def test_non_match_architecture_repository_context(complex_filter):
context = {"architecture": "x86_64/intel/cascadelake", "repository": "EESSI-pilot"}
context = {"architecture": "x86_64/intel/cascadelake", "repository": "EESSI"}
expected = False
actual = complex_filter.check_filters(context)
assert expected == actual
Expand All @@ -132,7 +132,7 @@ def arch_filter_slash_syntax():


def test_match_architecture_syntax_slash(arch_filter_slash_syntax):
context = {"architecture": "x86_64/intel/cascadelake", "repository": "EESSI-pilot"}
context = {"architecture": "x86_64/intel/cascadelake", "repository": "EESSI"}
expected = True
actual = arch_filter_slash_syntax.check_filters(context)
assert expected == actual
Expand All @@ -153,7 +153,7 @@ def arch_filter_dash_syntax():


def test_match_architecture_syntax_dash(arch_filter_dash_syntax):
context = {"architecture": "x86_64-intel-cascadelake", "repository": "EESSI-pilot"}
context = {"architecture": "x86_64-intel-cascadelake", "repository": "EESSI"}
expected = True
actual = arch_filter_dash_syntax.check_filters(context)
assert expected == actual
Expand Down