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 xversion test script #140

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update xversion test script #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion crossversion/xversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import shutil

# put this in one place
supported_versions = ["master", "v4.1", "v3.1", "v3.2"]
supported_versions = ["master", "v4.2", "v4.1", "v3.1", "v3.2"]

pmix_git_url = "https://github.com/pmix/pmix.git"
pmix_release_url = "https://github.com/pmix/pmix/releases/download/"
Expand Down Expand Up @@ -454,6 +454,21 @@ def run_test(bld_server, bld_client, test_client=False, test_tool=False, test_ch
invalid_tool_pairs.append([bld.branch,"v3.0"])
invalid_tool_pairs.append([bld.branch,"v2.2"])
invalid_tool_pairs.append([bld.branch,"v2.0"])
elif target_branch == "master":
invalid_pairs.append([bld.branch,"master"])
invalid_tool_pairs.append([bld.branch,"master"])
invalid_pairs.append(["master", bld.branch])
invalid_tool_pairs.append(["master", bld.branch])
elif target_branch == "v4.2":
invalid_pairs.append([bld.branch,"v4.2"])
invalid_tool_pairs.append([bld.branch,"v4.2"])
invalid_pairs.append(["v4.2", bld.branch])
invalid_tool_pairs.append(["v4.2", bld.branch])
elif target_branch == "v4.1:
invalid_pairs.append([bld.branch,"v4.1"])
invalid_tool_pairs.append([bld.branch,"v4.1"])
invalid_pairs.append(["v4.1", bld.branch])
invalid_tool_pairs.append(["v4.1", bld.branch])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not make a more general block outside of the selection logic like:

          # Do not test the Build branch against the Target branch.
          # If we are fixing cross-version issues then this is likely to fail which is correct in this circumstance.
          invalid_pairs.append([bld.branch, target_branch])
          invalid_pairs.append([target_branch, bld.branch])
          invalid_tool_pairs.append([bld.branch, target_branch])
          invalid_tool_pairs.append([target_branch, bld.branch])

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm not entirely wild about this patch just yet. We don't want to test against the HEAD of the specific target branch as that is what we are changing, but we do want to test against any prior tagged releases in that branch to ensure we aren't breaking compatibility within the series. Still scratching my head over it. Your suggestion would indeed clean things up - just not sure yet what the logic should be to get what we really want.

Hope that makes some sense.

else:
invalid_pairs.append(["v2.0",bld.branch])
invalid_tool_pairs.append(["v2.0",bld.branch])
Expand Down