From 8f4925317c40242f09b963f8fb58c2d00aecc64f Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Tue, 7 Jul 2020 17:39:21 +0200 Subject: [PATCH 1/7] update bindep in hope to help centos8 build --- bindep.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bindep.txt b/bindep.txt index eb458b065..cf94d2a8c 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,6 +1,11 @@ -build-essential [platform:dpkg] -python-dev [platform:dpkg] -python-devel [platform:rpm] -libffi-dev [platform:dpkg] +# This is a cross-platform list tracking distribution packages needed by tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +gcc [compile test] +libc6-dev [compile test platform:dpkg] libffi-devel [platform:rpm] -openssl-devel [platform:rpm] +libffi-dev [compile test platform:dpkg] +libffi6 [platform:dpkg] +libssl-dev [compile test platform:dpkg] +python3-dev [compile test platform:dpkg] +python3-devel [compile test platform:rpm] From e527c9e2c0ea671bb0aa27092c211e5479d721dc Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Tue, 7 Jul 2020 18:16:50 +0200 Subject: [PATCH 2/7] add centos job --- .zuul.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index a00ffa37c..6217a5b54 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,11 +3,17 @@ parent: tox-functional branches: master +- job: + name: tox-py37-centos8 + parent: tox-py37 + nodeset: centos-8 + - project: merge-mode: squash-merge check: jobs: - tox-py37 + - tox-py37-centos8 - tox-pep8 - tox-docs - tox-functional From 4a29c5a50d180aa2387eb76b7b777a239325b1a3 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 8 Jul 2020 08:54:07 +0200 Subject: [PATCH 3/7] try deb --- .zuul.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6217a5b54..7ba31b0db 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,16 +4,16 @@ branches: master - job: - name: tox-py37-centos8 + name: tox-py37-deb parent: tox-py37 - nodeset: centos-8 + nodeset: debian-buster - project: merge-mode: squash-merge check: jobs: - tox-py37 - - tox-py37-centos8 + - tox-py37-deb - tox-pep8 - tox-docs - tox-functional From abe91ecf709dc6dc675f41220a4e12dc7bd90627 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 8 Jul 2020 11:20:34 +0200 Subject: [PATCH 4/7] try focal --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7ba31b0db..7f7d1fb87 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,7 +6,7 @@ - job: name: tox-py37-deb parent: tox-py37 - nodeset: debian-buster + nodeset: ubuntu-focal - project: merge-mode: squash-merge From 74118b081f7b8772468b3da95585b5e261ffcfdd Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 8 Jul 2020 11:47:24 +0200 Subject: [PATCH 5/7] use template publish --- .zuul.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 7f7d1fb87..d95d5035f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,6 +10,8 @@ - project: merge-mode: squash-merge + templates: + - publish-to-pypi check: jobs: - tox-py37 From 568b5c90e59a032f75b11f8b590c52306666220b Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 8 Jul 2020 11:59:19 +0200 Subject: [PATCH 6/7] fallback bionic --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index d95d5035f..d29075ab6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,7 +6,7 @@ - job: name: tox-py37-deb parent: tox-py37 - nodeset: ubuntu-focal + nodeset: ubuntu-bionic - project: merge-mode: squash-merge From 06c6e0d406ce5089536cefe342acbf8114fb79f3 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 8 Jul 2020 12:21:27 +0200 Subject: [PATCH 7/7] simplify --- .zuul.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d29075ab6..0909d8155 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,11 +3,6 @@ parent: tox-functional branches: master -- job: - name: tox-py37-deb - parent: tox-py37 - nodeset: ubuntu-bionic - - project: merge-mode: squash-merge templates: @@ -15,13 +10,14 @@ check: jobs: - tox-py37 - - tox-py37-deb + - tox-py38 - tox-pep8 - tox-docs - tox-functional gate: jobs: - tox-py37 + - tox-py38 - tox-pep8 - tox-docs - tox-functional