diff --git a/denis/utilities.py b/denis/utilities.py index c61c69e9..59ef108e 100644 --- a/denis/utilities.py +++ b/denis/utilities.py @@ -107,13 +107,18 @@ def check_signed_off_by(repo, tag): [_, _, user] = tag.split('_', 2) hostname = os.getenv("SINGULARITY_HOSTNAME") + usr_tbl = orbit.db.User + fullname = (usr_tbl.select() + .where(usr_tbl.username == user) + .first()).fullname + msg = 'signed off by check' msg += '\n' msg += '-------------------' msg += '\n\n' commits = repo.git.execute(['git', 'rev-list', '--reverse', tag]).split('\n') - expected_dco = f'Signed-off-by: {user} <{user}@{hostname}>' + expected_dco = f'Signed-off-by: {fullname} <{user}@{hostname}>' nr_flawless = 0 for i, commit in enumerate(commits): patch = repo.git.execute(['git', 'show', commit]) diff --git a/test-lib b/test-lib index 2fc92204..eb83714d 100644 --- a/test-lib +++ b/test-lib @@ -116,7 +116,7 @@ setup_submissions_for() { local user="$1" pushd "$SCRIPT_DIR" - orbit/warpdrive.sh -u "$user" -p builder -n || orbit/warpdrive.sh -u "$user" -p builder -m + orbit/warpdrive.sh -u "$user" -f "$user" -p builder -n || orbit/warpdrive.sh -u "$user" -f "$user" -p builder -m popd pushd "$WORKDIR"/submissions