opendev/gerritlib
Code Issues Proposed changes

Run gerritlib-jeepyb-integration on ubuntu-focal

Browse Source 
Recent versions of pyca/crytpography, which jeepyb requires, need a
new enough pip to support ABI3 wheels and pyptoject.toml files. The
version on ubuntu-bionic nodes is too old for this, so use
ubuntu-focal for the job.

Also switch to referring to the Gerrit SSH API by IP address
(127.0.0.1) since it listens on 0.0.0.0 (all IPv4 addresses) but
ssh-keygen seems to resolve the name "localhost" to ::1 (the IPv6
loopback).

Change-Id: I9b09943bd6bb283a83497bc42e9ffdc9955eb01d
This commit is contained in:
Jeremy Stanley 2021-03-23 20:34:27 +00:00
parent 99136e1e16
commit 874d4776ee
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -1,6 +1,7 @@
- job: - job:
name: gerritlib-jeepyb-integration name: gerritlib-jeepyb-integration
description: Run manage_projects with gerritlib from source against Gerrit description: Run manage_projects with gerritlib from source against Gerrit
nodeset: ubuntu-focal
pre-run: playbooks/jeepyb-integration/pre.yaml pre-run: playbooks/jeepyb-integration/pre.yaml
run: playbooks/jeepyb-integration/run.yaml run: playbooks/jeepyb-integration/run.yaml
post-run: playbooks/jeepyb-integration/post.yaml post-run: playbooks/jeepyb-integration/post.yaml

8
playbooks/jeepyb-integration/run.yaml
View File

@ -41,7 +41,7 @@
delay: 1 delay: 1
retries: 120 retries: 120
- name: fetch ssh host keys from gerrit - name: fetch ssh host keys from gerrit
shell: ssh-keyscan -p 29418 localhost >> ~/.ssh/known_hosts shell: ssh-keyscan -p 29418 127.0.0.1 >> ~/.ssh/known_hosts
- name: Set perms on new ssh private key - name: Set perms on new ssh private key
become: true become: true
@ -93,13 +93,13 @@
chdir: src/opendev.org/opendev/gerritlib chdir: src/opendev.org/opendev/gerritlib
- name: Check test-repo-1 exists - name: Check test-repo-1 exists
shell: shell:
cmd: ssh -i tools/sshkey/admin -p 29418 admin@localhost gerrit ls-projects | grep test-repo-1 cmd: ssh -i tools/sshkey/admin -p 29418 admin@127.0.0.1 gerrit ls-projects | grep test-repo-1
chdir: src/opendev.org/opendev/gerritlib chdir: src/opendev.org/opendev/gerritlib
- name: Check test-repo-2 exists - name: Check test-repo-2 exists
shell: shell:
cmd: ssh -i tools/sshkey/admin -p 29418 admin@localhost gerrit ls-projects | grep test-repo-2 cmd: ssh -i tools/sshkey/admin -p 29418 admin@127.0.0.1 gerrit ls-projects | grep test-repo-2
chdir: src/opendev.org/opendev/gerritlib chdir: src/opendev.org/opendev/gerritlib
- name: Check test-repo-3 does not exist - name: Check test-repo-3 does not exist
shell: shell:
cmd: ssh -i tools/sshkey/admin -p 29418 admin@localhost gerrit ls-projects | grep -v test-repo-3 cmd: ssh -i tools/sshkey/admin -p 29418 admin@127.0.0.1 gerrit ls-projects | grep -v test-repo-3
chdir: src/opendev.org/opendev/gerritlib chdir: src/opendev.org/opendev/gerritlib