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

Update E3SM-Project submodule #606

Merged
merged 2 commits into from
Apr 18, 2023
Merged

Update E3SM-Project submodule #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e16a41
Add a way to skip PRs in updating E3SM submodules
xylar Apr 17, 2023
23d228a
Update E3SM-Project submodule
xylar Apr 18, 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
2 changes: 1 addition & 1 deletion E3SM-Project
Open in desktop
Submodule E3SM-Project updated 305 files
2 changes: 2 additions & 0 deletions utils/e3sm_update/example.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ setup_command = compass suite -s -c ocean -t pr
# the absolute or relative path to the load script use to activate the
# compass environment
load_script = load_compass_e3sm__update_chrysalis_intel_openmpi.sh
# a list of pull request numbers to skip
skip_prs =
46 changes: 24 additions & 22 deletions utils/e3sm_update/test_e3sm_changes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,
framework_strings, current, new, work_base, mpas_subdir,
make_command, setup_command, load_script):
make_command, setup_command, load_script, skip_prs):
"""
The driver function for calling ``git bisect`` to find the first "bad"
commit between a known "good" and "bad" E3SM commit.
Expand Down Expand Up @@ -49,23 +49,23 @@ def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,
compass environment
"""
print('\n')
print(72*'-')
print(72 * '-')
print(f'Testing to update {submodule} submodule')
print(72*'-')
print(72 * '-')

load_script = os.path.abspath(load_script)

commands = f'git submodule update --init'
commands = 'git submodule update --init'
print_and_run(commands)

current_submodule = f'{submodule}-current'
new_submodule = f'{submodule}-new'

print(f'Setting up current submodule\n')
print('Setting up current submodule\n')

setup_worktree(submodule, worktree=current_submodule, hash=current)

print(f'\nSetting up new submodule\n')
print('\nSetting up new submodule\n')

setup_worktree(submodule, worktree=new_submodule, hash=new)

Expand All @@ -90,12 +90,13 @@ def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,
hash = line.split(' ')[0]
end = line.split('#')[-1].replace('(', ' ').replace(')', ' ')
pull_request = end.split()[0]
index = len(pull_requests)
worktree = f'{index + 1:02d}_{pull_request}'
pull_requests.append({'hash': hash,
'component': component,
'pull_request': pull_request,
'worktree': worktree})
if pull_request not in skip_prs:
index = len(pull_requests)
worktree = f'{index + 1:02d}_{pull_request}'
pull_requests.append({'hash': hash,
'component': component,
'pull_request': pull_request,
'worktree': worktree})
else:
print(f'Warning: skipping commit with no "#" for PR:\n{line}')

Expand All @@ -109,14 +110,14 @@ def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,
print(f'{len(pull_requests)+1:02d}: {new} {new_submodule} (new)')
print('\n')

print(f'Setting up worktrees of all commits of interest\n')
print('Setting up worktrees of all commits of interest\n')

for index, data in enumerate(pull_requests):
hash = data['hash']
worktree = data['worktree']
setup_worktree(submodule, worktree=worktree, hash=hash)

print(f'Building each worktree and submitting comparison tests\n')
print('Building each worktree and submitting comparison tests\n')

print('00: current\n')
baseline = f'{work_base}/00_current'
Expand Down Expand Up @@ -178,11 +179,11 @@ def setup_and_submit(load_script, setup_command, worktree, mpas_subdir,
if ' -t ' in setup_command:
split = setup_command.split()
index = split.index('-t')
suite = split[index+1]
suite = split[index + 1]
elif '--test_suite' in setup_command:
split = setup_command.split()
index = split.index('--test_suite')
suite = split[index+1]
suite = split[index + 1]
else:
suite = 'custom'

Expand Down Expand Up @@ -215,9 +216,9 @@ def print_and_run(commands, get_output=False):

def print_pr_description(submodule, repo_url, current, new, pull_requests):
print('')
print(72*'-')
print(f'Pull Request Description Text')
print(72*'-')
print(72 * '-')
print('Pull Request Description Text')
print(72 * '-')
print('')

print(f'This merge updates the {submodule} submodule from '
Expand All @@ -241,8 +242,8 @@ def string_to_list(string):

def main():
parser = argparse.ArgumentParser(
description='Test changes in E3SM before an update to the E3SM-Project '
'submodule')
description='Test changes in E3SM before an update to the '
'E3SM-Project submodule')
parser.add_argument("-f", "--config_file", dest="config_file",
required=True,
help="Configuration file",
Expand All @@ -265,7 +266,8 @@ def main():
work_base=section['work_base'], mpas_subdir=section['mpas_subdir'],
make_command=section['make_command'],
setup_command=section['setup_command'],
load_script=section['load_script'])
load_script=section['load_script'],
skip_prs=string_to_list(section['skip_prs']))


if __name__ == '__main__':
Expand Down