diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index d853cb9f22..00433601e3 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -2,73 +2,6 @@ - project: queue: kolla -- secret: - name: kolla_dockerhub_credentials - data: - username: !encrypted/pkcs1-oaep - - LgqBUH6EMZT5mKJMoXsaMAv9CSbiAgoqxU98QjeoDX84K/y6NmFF/ZhficQD0+JT7NfpB - 2pPAEKeILn63Toeu6ZFkGeUHo5Gf6cIzbXJjqdWIvnwpxV+zUWqM8C2uf8JZjc3mIVOXp - yShDzmCCVkeX/x1n69pwuURabR1p5N15CbroT4l1eK7HGiMAcQwhRaCgDpgxsX5yKP07A - jIn9M3xwJdjSPxQ7dp1ean3CGPtEHkRuOHjezXfQfdIB7ZMNkGkDaQKTwof56UKDT+MMN - L0QT0PntUd0QwTYfUeCPGRd2TI8EFq+iuEy+6945OxLN9WcZmBza3HTVRyPQ8Hx1hXfaP - yth8F56SIchc5HQP+zHRZg9KQlb5wPNdKwoIkhDVBZW5Zb1mZmRJF/LR45o+NT0DT7+SE - 6JshLSOHChD7JfQE19Gi/Rrf9VZS4wd5TfHQSOQH1u8pZzC71sBOkeSnsQsqWePoyERN2 - gr0uvfB6yX7y2WHfuZRs2a+5HfYjAR+CQPA87nJYOQf8AfQ++9RGVFCSCpaAmTU2tGcjs - /J/khnpd0iNNimT3+oXqtBnvi5WCWZ+t/yDfsa3HQ5qRtbXepGoFDibOfhACZ8K7jaFGV - lBF6StAFCCOz+MXUyn/a+Vo19k43CRe3kdIpOcca0bcrjOx8fqBnc4zmnuhgQQ= - password: !encrypted/pkcs1-oaep - - najtUY1DOo18hXxnz8L+FdJo2gW5jyZbJhnMOK1qu9/N94N+K+S72hgvusFMewq4rq9Es - fsSe98ZCBmMUT1ZUVs9LymSgzaQSxSXkyETlaEjauF/DLahEHCCWW249l5pQ7lZXiaBAM - edlZCdTth+wSFLMcF4jhoFlftAcFv8ue10HrH3vTG7lYfhL8u1ueGKsauVcxzAiT/F1Wd - xACZrT5vGoHlv9fALK39JC9OuNNNLPAkqecsP+/abjttyX5OR/ZQ2amM3hWoC1cFIxsYR - Gfakq0yLEewnErV8ryaTSzgvpT8bB1wJk8Ti/iU6xuaNO13x7VpHtMErHcN0BrOadPJdb - B/xFqkIdX0km6ioffZUELsxrEonSD8tAS8vdn5+KUBFkg9f/KJdCAaR3LmZvF975U9QdI - 0BnA0XcjOBm+HZqWvcnkIUmoTqzK0vdjRJ2lRPqTvTBTc/i82mTMiChf0G85CV7kTGdjG - D9O5sYvy2fQobg28DCXXTxA7YV03nVFPJ56VhB6TmbKCZXqlKNXIbWy5RSNZ8d4cfC7qF - kOrdp8oW6+KidWKFYrJaqFhGfpfg+j1nv8BIzGqmspN7PsUo9Q/svCVy+d5FaDs7rxz+j - b7jPyuV0g5760TUHjsqIlamYegGSz1ZhGkp2Gl1VzQRjo2/6Tr6Gk546DMlZDI= - -- secret: - name: kolla_quay_io_creds - data: - username: !encrypted/pkcs1-oaep - - VsvMvV5wOUfl5B2HJboWfN8mta/Tuk7PXcJf5RfKk4uXP6qYGM4dcMB9EdoJNhMCi7FeA - NrTZaxf/AjLAkgKlRhz7sPKhmR95+jrFRgEzedpcCamdPkCa+wNQEMNMd0rTwioYUEWm4 - Y+Oa2mIswy5LcUViz38MPQhf0725U5sYtH2qkuhMbU8u8vzYhSk749xtAN6I1T8ziTKKB - 3FBowFc2rSRJUQPsLLZjTxBHbrk+00p/DPoHLOz9/9Jf5U//jkqx4ziE2w1a4+x/kWlYT - BPXuRL9wWN9ci2uKuoDRRd6QHJzPIJerKG07YU4PAcS3M245rbjjUQC3n3SQJs3u4kKI8 - rZrxfbmtbfjkzRQXnhnhPk47PebpjnpEUNw6+scnQ+ELdQ0QYGsVRM4x4/ywe5CeFYVDR - whQQ1iG21FOs3iv592I7P7l4cEKqKFyx9qiV4t2fyLrHgtU+L/05iENH9igGJ0tDCQ5zT - 2F2laUWGtzUh76txuFDjpBxR3qS62g825dZXaTegkA+v6c1az23lrYTqbTRf63cuAQyYX - APPRC5QU0URXBoIbWb0ry3O5lr/uudI1ZCLN8SSJhpmZAIlviOfaxrKu9fg2YY9e0xpz9 - CMEWQ/n1EsUyL34Wv189Rvpq4M4GTvozEKsRsjY3u0ygwEUXcH2lEXGOrs+hms= - password: !encrypted/pkcs1-oaep - - dR2beX9Bn7O8iCqNHtWo1FWX71vy+CwffDk5rafUh5yew2OVNcVtVjVOPvHwb5zZv1LCd - MVcgIJe513dM5tQkn2H/HvN/seVu/CfHA6lg6Tj+ueW9VdUH6KiBPr+NCgQWX+Xt3sXbt - sPzfNGpvTw1ZCUp0nnudZEKPZ2jn83baNMumW8E8xPb4s2kePzINsb8sGvqy6BOk5rUIo - 7DaEwWrNnq9TTnMcWGIF+fLP5Pin7+fmvnLkT6qRN4v5FszpHYm8YCpv02nzqI1/F9HeM - P3GtkUdIPxa1+3VwZ/DSA9BWi4VG15jDtaxeZFVGQuMqQAiCx8Jqvd+xX2qugAq1m+U7W - JobDbaeTYrUmJ1zUaspPZ16RTSf9UGCTaejoSVKM9lJHv6ixtsX7UWkgFvceVrlkt7TtH - 2mqhBnXvwB6VD5d311WRUfNXz7gb60otisB5G2k/UnRnv1Mu33TPVT7XOFDpVnAvRS3lt - haJ34N7AWnDIsllvzcmVWTw3wf/6LLfOQrW2Z+vNambyR4Oc+LVUTbEvZVIU65LpOTIn3 - LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A - 0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM= - -- secret: - name: kolla_quay_io_api - data: - token: !encrypted/pkcs1-oaep - - uGqaFVfPP2HdAELtq12FTGstT7Y7/TCz4IwAgrGtB+2ZUXgCTYrkzhImRLFG3OQMqzx4d - oO6ChFxPGI9hX06mg4MbPBVYXCyh+opxxeaVrgtu03IOB1V8bMlGfVgPSJO8mEp/00poY - hMtut/12FWMhjNO+Um2XaKtRmDZKYYoPmuO4BDauJTaTAl1+Elhm5qjrkFOuklb4jP07c - 9OIex5KiSIqMCmSzduGzVK60BoByzl4u2KPDheEAcohIpjrkm9c6VBe13hZw5llXiDRf2 - LqHPu/IXIFlT9bnPp49rP8+Gm3z1/sdNsN+TKk1VSWGlUudvaBO9Cdejwo+NMWKMAqwGi - drzt/YcCDCQ1SFzkhWk5EdEN5qyrH3jF3I5YzcQ1dKXgr9NOoQSwNLxL5oNL88sH7tqPT - xN+EKz+AGG+ib3S9efhYFkFkqs9z4ia8mIM+2/lH5V5gy7iVVMHmxPr+JJ+5sq5lsHrS5 - No+QrCyeZWWH2qnToQo8S73i9yISzDAML6u5NlKfIJ/nAqsxBOqpCq8xqgI3PLD86lmfL - 7xlK/HOqvgMubcqzR33mRoSnkcnFpD50O9k41ZsF9SPKHMGmk9LyI05vkL6bcc3ypLBQY - BTdg70hF/5m6rHFbVCsNDPlVykcEzsW6D4qqxh/5b3LHbPYbe7ciXcc+PTnYb8= - - nodeset: name: kolla-centos-9-stream nodes: diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index 3ffcc3fb58..10d59bdaad 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -14,13 +14,8 @@ - kolla-build-debian - kolla-build-debian-podman - kolla-ansible-debian - periodic-stable: - jobs: - - kolla-publish-debian-quay - - kolla-publish-debian-aarch64-quay experimental: jobs: - - kolla-build-no-infra-wheels-debian - kolla-ansible-debian-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* @@ -45,56 +40,3 @@ parent: kolla-build-debian nodeset: kolla-debian-bookworm-aarch64 voting: false - -- job: - name: kolla-publish-debian-dockerhub - parent: kolla-build-debian - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: dockerhub - kolla_namespace: kolla - secrets: - - kolla_dockerhub_credentials - -- job: - name: kolla-publish-debian-quay - parent: kolla-build-debian - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: quay.io - kolla_namespace: openstack.kolla - secrets: - - kolla_quay_io_creds - - kolla_quay_io_api - -- job: - name: kolla-publish-debian-aarch64-dockerhub - parent: kolla-build-debian-aarch64 - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: dockerhub - kolla_namespace: kolla - secrets: - - kolla_dockerhub_credentials - -- job: - name: kolla-publish-debian-aarch64-quay - parent: kolla-build-debian-aarch64 - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: quay.io - kolla_namespace: openstack.kolla - secrets: - - kolla_quay_io_creds - - kolla_quay_io_api - -- job: - name: kolla-build-no-infra-wheels-debian - parent: kolla-build-no-infra-wheels-base - nodeset: kolla-debian-bookworm - vars: - base_distro: debian diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 9f650e7106..4433e1cf39 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -4,10 +4,8 @@ - openstack-python3-jobs-kolla - openstack-python3-jobs-arm64 - openstack-cover-jobs - - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 - - periodic-stable-jobs check: jobs: - kolla-tox-genconfig diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml index a1ce643702..6b4ac43c00 100644 --- a/.zuul.d/rocky.yaml +++ b/.zuul.d/rocky.yaml @@ -33,12 +33,6 @@ - kolla-build-rocky9 - kolla-build-rocky9-podman - kolla-ansible-rocky9 - periodic-stable: - jobs: - - kolla-publish-rocky9-quay - experimental: - jobs: - - kolla-build-no-infra-wheels-rocky9 - job: name: kolla-build-rocky9 @@ -61,34 +55,3 @@ parent: kolla-build-rocky9 nodeset: kolla-rockylinux-9-aarch64 voting: false - -- job: - name: kolla-build-no-infra-wheels-rocky9 - parent: kolla-build-no-infra-wheels-base - nodeset: kolla-rockylinux-9 - vars: - base_distro: rocky - base_distro_version: 9 - -- job: - name: kolla-publish-rocky9-dockerhub - parent: kolla-build-rocky9 - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: dockerhub - kolla_namespace: kolla - secrets: - - kolla_dockerhub_credentials - -- job: - name: kolla-publish-rocky9-quay - parent: kolla-build-rocky9 - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: quay.io - kolla_namespace: openstack.kolla - secrets: - - kolla_quay_io_creds - - kolla_quay_io_api diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 8044de0cf5..59e6523152 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -12,8 +12,6 @@ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - kolla-ansible-ubuntu-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - - kolla-ansible-ubuntu-swift: - files: ^docker/(base|openstack-base|glance|swift)/ - kolla-ansible-ubuntu-mariadb: files: ^docker/(base|mariadb)/ - kolla-ansible-ubuntu-masakari: @@ -37,13 +35,6 @@ - kolla-build-ubuntu-jammy-podman - kolla-build-ubuntu-noble-podman - kolla-ansible-ubuntu - periodic-stable: - jobs: - - kolla-publish-ubuntu-jammy-quay - - kolla-publish-ubuntu-noble-quay - experimental: - jobs: - - kolla-build-no-infra-wheels-ubuntu - job: name: kolla-build-ubuntu-jammy @@ -90,45 +81,3 @@ parent: kolla-build-ubuntu-noble nodeset: kolla-ubuntu-noble-aarch64 voting: false - -- job: - name: kolla-publish-ubuntu-jammy-dockerhub - parent: kolla-build-ubuntu-jammy - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: dockerhub - kolla_namespace: kolla - secrets: - - kolla_dockerhub_credentials - -- job: - name: kolla-publish-ubuntu-jammy-quay - parent: kolla-build-ubuntu-jammy - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: quay.io - kolla_namespace: openstack.kolla - secrets: - - kolla_quay_io_creds - - kolla_quay_io_api - -- job: - name: kolla-publish-ubuntu-noble-quay - parent: kolla-build-ubuntu-noble - post-run: tests/playbooks/publish.yml - vars: - publisher: true - kolla_registry: quay.io - kolla_namespace: openstack.kolla - secrets: - - kolla_quay_io_creds - - kolla_quay_io_api - -- job: - name: kolla-build-no-infra-wheels-ubuntu - parent: kolla-build-no-infra-wheels-base - nodeset: kolla-ubuntu-noble - vars: - base_distro: ubuntu diff --git a/requirements.txt b/requirements.txt index f96132cc73..7f102c85bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 Jinja2>=3.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) oslo.config>=5.1.0 # Apache-2.0 -setuptools>=64.0.0 # PSF/ZPL; python_version >= '3.12' +setuptools>=64.0.0,<82 # PSF/ZPL; python_version >= '3.12'