diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2023-03-13 13:01:53 -0700 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2023-03-14 08:07:27 -0700 |
| commit | fcd9de135b0685be44459bd351529617e06f377e (patch) | |
| tree | 2f3c958bb14d89931be8e8d910f8d2267e04b905 | |
| parent | 12a0aca425ead764d722ae23f5a12ae2ec0b4a3f (diff) | |
| download | git-review-fcd9de135b0685be44459bd351529617e06f377e.tar.gz | |
Test Python bounds only
This bumps the newest python version tested to 3.11 and drops testing
for 3.7, 3.8, and 3.9. We only test the lower and upper python version
bounds.
We switch to an ed25519 ssh key instead of rsa because Ubuntu Jammy
defaults to rsa + sha2 and Gerrit 3.4.4 does not understand this. This
results in a golden site version bump.
Change-Id: I3989460575fa9c389233244683318a6cfded68fe
| -rw-r--r-- | .zuul.yaml | 8 | ||||
| -rw-r--r-- | git_review/tests/__init__.py | 7 |
2 files changed, 6 insertions, 9 deletions
@@ -9,12 +9,8 @@ - nox-linters - nox-py36: nodeset: ubuntu-bionic - - nox-py37: - nodeset: ubuntu-bionic - - nox-py38: - nodeset: ubuntu-focal - - nox-py39: - nodeset: ubuntu-focal + - nox-py311: + nodeset: ubuntu-jammy gate: jobs: *jobs promote: diff --git a/git_review/tests/__init__.py b/git_review/tests/__init__.py index c274cde..913458c 100644 --- a/git_review/tests/__init__.py +++ b/git_review/tests/__init__.py @@ -40,7 +40,7 @@ else: WAR_URL = 'https://gerrit-releases.storage.googleapis.com/gerrit-3.4.4.war' # Update GOLDEN_SITE_VER for every change altering golden site, including # WAR_URL changes. Set new value to something unique (just +1 it for example) -GOLDEN_SITE_VER = '6' +GOLDEN_SITE_VER = '7' # NOTE(yorik-sar): This function needs to be a perfect hash function for @@ -164,8 +164,9 @@ class GerritHelpers(DirHelpers): with open(golden_ver_file, 'w') as f: f.write(GOLDEN_SITE_VER) - # create SSH public key - utils.run_cmd('ssh-keygen', '-t', 'rsa', '-b', '4096', '-m', 'PEM', + # Create SSH public key. This is not RSA because Jammy wants to + # do rsa + sha2 by default and Gerrit 3.4.4 does not understand this. + utils.run_cmd('ssh-keygen', '-t', 'ed25519', '-f', self._dir('gsite', 'test_ssh_key'), '-N', '') def _run_gerrit_cli(self, command, *args): |