airship
/
pegleg
Code Issues Proposed changes

Uplift k8s, promenade and shipyard dependencies 

* disable python 35, leave only 36
* switch to bionic nodeset only
* update requirements.txt, Pipfile and lock

Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Change-Id: Ia3c4df9d1f39f0f2cebf8ba0d89aebc5eec6f674
This commit is contained in:
Ruslan Aliev 2022-07-18 20:55:00 -05:00
parent cbc87967eb
commit 6833800ecc
10 changed files with 835 additions and 615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
.zuul.yaml
View File

@ -14,7 +14,6 @@
templates:
- docs-on-readthedocs
- openstack-python36-jobs
- openstack-python37-jobs
- openstack-cover-jobs
- release-notes-jobs-python3
vars:
@ -34,24 +33,18 @@
jobs:
- openstack-tox-pep8-bionic
- pegleg-dependency-vulnerability-check
- airship-pegleg-docker-build-gate-ubuntu_xenial
- airship-pegleg-docker-build-gate-ubuntu_bionic
- airship-pegleg-docker-build-gate-opensuse
- airship-pegleg-lint-yaml
gate:
jobs:
- openstack-tox-pep8-bionic
- pegleg-dependency-vulnerability-check
- airship-pegleg-docker-build-gate-ubuntu_xenial
- airship-pegleg-docker-build-gate-ubuntu_bionic
- airship-pegleg-docker-build-gate-opensuse
- airship-pegleg-lint-yaml
post:
jobs:
- airship-pegleg-docker-publish-ubuntu_xenial
- airship-pegleg-docker-publish-ubuntu_bionic
- airship-pegleg-docker-publish-opensuse
- pegleg-upload-git-mirror
- nodeset:
@ -60,6 +53,12 @@
- name: primary
label: ubuntu-xenial
- nodeset:
name: airship-pegleg-single-node-bionic
nodes:
- name: primary
label: ubuntu-bionic
- job:
name: openstack-tox-pep8-bionic
parent: openstack-tox-pep8
@ -85,26 +84,11 @@
tox_envlist: safety
bindep_profile: test py36
- job:
name: airship-pegleg-docker-build-gate-ubuntu_xenial
voting: false
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
irrelevant-files:
- '^doc/.*'
vars:
publish: false
distro: ubuntu_xenial
tags:
dynamic:
patch_set: true
- job:
name: airship-pegleg-docker-build-gate-ubuntu_bionic
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
nodeset: airship-pegleg-single-node-bionic
irrelevant-files:
- '^doc/.*'
vars:
@ -114,46 +98,11 @@
dynamic:
patch_set: true
- job:
name: airship-pegleg-docker-build-gate-opensuse
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
voting: false
irrelevant-files:
- '^doc/.*'
vars:
publish: false
distro: opensuse_15
tags:
dynamic:
patch_set: true
- job:
name: airship-pegleg-docker-publish-ubuntu_xenial
voting: false
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
secrets:
- airship_pegleg_quay_creds
irrelevant-files:
- '^doc/.*'
vars:
publish: true
distro: ubuntu_xenial
tags:
dynamic:
branch: true
commit: true
static:
- latest
- job:
name: airship-pegleg-docker-publish-ubuntu_bionic
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
nodeset: airship-pegleg-single-node-bionic
secrets:
- airship_pegleg_quay_creds
irrelevant-files:
@ -168,26 +117,6 @@
static:
- latest
- job:
name: airship-pegleg-docker-publish-opensuse
timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node
voting: false
secrets:
- airship_pegleg_quay_creds
irrelevant-files:
- '^doc/.*'
vars:
publish: true
distro: opensuse_15
tags:
dynamic:
branch: true
commit: true
static:
- latest
- secret:
name: airship_pegleg_quay_creds
data:

2
Makefile
View File

@ -27,7 +27,7 @@ PUSH_IMAGE ?= false
# use this variable for image labels added in internal build process
LABEL ?= org.airshipit.build=community
COMMIT ?= $(shell git rev-parse HEAD)
DISTRO ?= ubuntu_xenial
DISTRO ?= ubuntu_bionic
IMAGE ?= $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)-${DISTRO}
PYTHON_BASE_IMAGE ?= python:3.6
BASE_IMAGE ?=

14
Pipfile
View File

@ -4,8 +4,8 @@ url = "https://pypi.org/simple"
verify_ssl = true
[dev-packages]
pytest = "*"
pytest-cov = "*"
pytest = "~=6.1.1"
pytest-cov = "~=2.10.1"
testfixtures = "*"
pytest-xdist = "*"
requests = ">=2.20.0"
@ -15,11 +15,11 @@ flake8 = "*"
yapf = "~=0.28.0"
hacking = ">=1.1.0"
flake8-import-order = ">=0.18.1"
bandit = ">=1.6.0"
bandit = ">=1.6.0,<=1.7.1"
[packages]
click = ">=6.7"
jsonschema = ">=3.0.1<4"
jsonschema = ">=3.0.1,<4"
cryptography = ">=2.7"
python-dateutil = ">=2.8.1"
GitPython = "~=2.1.11"
@ -27,13 +27,13 @@ docker = ">=3.7.2"
pylibyaml = "~=0.1"
PyYAML = "~=5.1"
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "5cd799cc5d04527ac782270008ff647b3779ff05"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "363ceca06915a3fe5f3d6819a33b771768323f0a"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "8240608fe5e73a051a016b0ae100715849c0a771",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "e207bbe9661716efab8dc017925489072d28a936"}
"oslo.i18n" = "~=3.24.0"
"oslo.utils" = ">=3.42.1"
six = ">=1.15.0"
debtcollector = "~=1.22.0"
zipp = "~=1.2.0"
zipp = "~=3.6.0"
[requires]
python_version = "3.6"

1313
Pipfile.lock generated
View File

File diff suppressed because it is too large Load Diff

12
doc/requirements.txt
View File

@ -3,13 +3,13 @@
# process, which may cause wedges in the gate later.
# Documentation
sphinx==3.1.0
oslosphinx==4.18.0 # Apache-2.0
sphinx_rtd_theme==0.4.3
docutils==0.17.1
sphinx>=3.1.0
oslosphinx>=4.18.0 # Apache-2.0
sphinx_rtd_theme>=0.4.3
docutils>=0.17.1
# UML image generation
plantuml==0.3.0
plantuml>=0.3.0
# Releasenotes
reno==3.1.0 # Apache-2.0
reno>=3.1.0 # Apache-2.0

2
doc/source/conf.py
View File

@ -69,7 +69,7 @@ release = u'0.1.0'
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.

2
releasenotes/source/conf.py
View File

@ -59,7 +59,7 @@ master_doc = 'index'
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.

12
requirements.txt
View File

@ -28,8 +28,8 @@ fixtures==3.0.0
flake8==3.7.9
futurist==2.2.0; python_version >= '3.6'
git+https://opendev.org/airship/deckhand.git@5cd799cc5d04527ac782270008ff647b3779ff05#egg=deckhand
git+https://opendev.org/airship/promenade.git@363ceca06915a3fe5f3d6819a33b771768323f0a#egg=promenade
git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#egg=shipyard-client&subdirectory=src/bin/shipyard_client
git+https://opendev.org/airship/promenade.git@e207bbe9661716efab8dc017925489072d28a936#egg=promenade
git+https://opendev.org/airship/shipyard.git@8240608fe5e73a051a016b0ae100715849c0a771#egg=shipyard-client&subdirectory=src/bin/shipyard_client
gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
gitpython==2.1.15
setuptools==40.4.3
@ -43,11 +43,11 @@ iso8601==0.1.12
jinja2==2.10
jsonpath-ng==1.4.3
jsonpickle==1.4.1; python_version >= '2.7'
jsonschema>=3.0.1<4
jsonschema>=3.0.1,<4
keystoneauth1>=3.18.0
keystonemiddleware==5.3.0
kombu==4.6.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
kubernetes==11.0.0
kubernetes<24,>=23.0.0; python_version >= '3.6'
linecache2==1.0.0
mako==1.1.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
markupsafe==1.1.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
@ -94,7 +94,7 @@ python-keystoneclient==3.22.0
python-memcached==1.59
python-mimeparse==1.6.0
pytz==2020.1
pyyaml==5.1
pyyaml~=5.1
repoze.lru==0.7
requests==2.22.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
rfc3986==1.4.0
@ -124,4 +124,4 @@ websocket-client==0.57.0
werkzeug==0.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
wrapt==1.12.1
yappi==1.2.5
zipp==1.2.0
zipp~=3.6.0

2
tools/gate/playbooks/docker-image-build.yaml
View File

@ -86,7 +86,7 @@
- apt_key:
url: https://download.docker.com/linux/ubuntu/gpg
- apt_repository:
repo: "deb http://{{ deb_docker_repo }} xenial stable"
repo: "deb http://{{ deb_docker_repo }} bionic stable"
- apt:
name: "{{ item }}"
allow_unauthenticated: True

4
vcs-requirements.env
View File

@ -1,3 +1,3 @@
DECKHAND_VERSION=commit/5cd799cc5d04527ac782270008ff647b3779ff05
SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131
PROMENADE_VERSION=commit/363ceca06915a3fe5f3d6819a33b771768323f0a
SHIPYARD_VERSION=commit/8240608fe5e73a051a016b0ae100715849c0a771
PROMENADE_VERSION=commit/e207bbe9661716efab8dc017925489072d28a936