Remove openstack-helm-single-node nodeset
Change-Id: I85a1a27e851d1dd0c1e98478c54452ee4d1d3d91
This commit is contained in:
Sergiy Markin
parent
afc7ee07bb
commit
ac9b8ff96f
58
.zuul.yaml
58
.zuul.yaml
@ -11,11 +11,11 @@
|
||||
# limitations under the License.
|
||||
|
||||
- project:
|
||||
templates:
|
||||
- openstack-cover-jobs
|
||||
- docs-on-readthedocs
|
||||
- openstack-python38-jobs
|
||||
- openstack-python36-jobs
|
||||
# templates:
|
||||
# - openstack-cover-jobs
|
||||
# - docs-on-readthedocs
|
||||
# - openstack-python38-jobs
|
||||
# - openstack-python36-jobs
|
||||
vars:
|
||||
rtd_webhook_id: '38572'
|
||||
rtd_project_name: 'airship-deckhand'
|
||||
@ -38,6 +38,10 @@
|
||||
- openstack-tox-pep8
|
||||
- deckhand-airskiff-deployment-focal
|
||||
- deckhand-airskiff-deployment-bionic
|
||||
- deckhand-openstack-tox-docs
|
||||
- deckhand-openstack-tox-cover
|
||||
- deckhand-openstack-tox-py38
|
||||
- deckhand-openstack-tox-py36
|
||||
gate:
|
||||
jobs:
|
||||
- deckhand-tox-py36-postgresql
|
||||
@ -56,6 +60,10 @@
|
||||
- openstack-tox-pep8
|
||||
- deckhand-airskiff-deployment-focal
|
||||
- deckhand-airskiff-deployment-bionic
|
||||
- deckhand-openstack-tox-docs
|
||||
- deckhand-openstack-tox-cover
|
||||
- deckhand-openstack-tox-py38
|
||||
- deckhand-openstack-tox-py36
|
||||
post:
|
||||
jobs:
|
||||
- deckhand-upload-git-mirror
|
||||
@ -89,6 +97,27 @@
|
||||
- name: primary
|
||||
label: ubuntu-focal
|
||||
|
||||
- job:
|
||||
name: deckhand-openstack-tox-docs
|
||||
parent: openstack-tox-docs
|
||||
nodeset: deckhand-single-node-focal
|
||||
|
||||
- job:
|
||||
name: deckhand-openstack-tox-cover
|
||||
parent: openstack-tox-cover
|
||||
nodeset: deckhand-single-node-focal
|
||||
|
||||
- job:
|
||||
name: deckhand-openstack-tox-py38
|
||||
parent: openstack-tox-py38
|
||||
nodeset: deckhand-single-node-focal
|
||||
|
||||
- job:
|
||||
name: deckhand-openstack-tox-py36
|
||||
parent: openstack-tox-py36
|
||||
nodeset: deckhand-single-node
|
||||
|
||||
|
||||
- job:
|
||||
name: deckhand-tox-py38-postgresql
|
||||
parent: openstack-tox-py38
|
||||
@ -238,16 +267,17 @@
|
||||
|
||||
- job:
|
||||
name: deckhand-integration-docker-base
|
||||
abstract: true
|
||||
description: |
|
||||
Base job for running deckhand integration tests. Runs tests
|
||||
against Docker image generated from source code.
|
||||
nodeset: deckhand-single-node-focal
|
||||
timeout: 3600
|
||||
roles:
|
||||
- zuul: openstack/openstack-helm-infra
|
||||
vars:
|
||||
zuul_osh_relative_path: ../../openstack/openstack-helm/
|
||||
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra/
|
||||
zuul_treasuremap_relative_path: ../../airship/treasuremap/
|
||||
pre-run:
|
||||
- tools/gate/playbooks/osh-infra-upgrade-host.yaml
|
||||
- tools/gate/playbooks/osh-infra-deploy-docker.yaml
|
||||
@ -255,8 +285,10 @@
|
||||
- tools/gate/playbooks/run-integration-tests-docker.yaml
|
||||
post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
|
||||
required-projects:
|
||||
- openstack/openstack-helm
|
||||
- openstack/openstack-helm-infra
|
||||
- name: openstack/openstack-helm
|
||||
- name: openstack/openstack-helm-infra
|
||||
- name: airship/treasuremap
|
||||
override-checkout: v1.9
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
@ -268,7 +300,7 @@
|
||||
Run tox-based integration tests for the Airship Deckhand project under
|
||||
cPython version 3.8. Builds ubuntu (focal) deckhand image.
|
||||
parent: deckhand-integration-docker-base
|
||||
nodeset: openstack-helm-single-node
|
||||
nodeset: deckhand-single-node-focal
|
||||
vars:
|
||||
disable_keystone: false
|
||||
distro: ubuntu_focal
|
||||
@ -279,10 +311,10 @@
|
||||
Run tox-based integration tests for the Airship Deckhand project under
|
||||
cPython version 3.6. Builds ubuntu (focal) deckhand image.
|
||||
parent: deckhand-integration-docker-base
|
||||
nodeset: openstack-helm-single-node
|
||||
nodeset: deckhand-single-node-focal
|
||||
vars:
|
||||
disable_keystone: false
|
||||
distro: ubuntu_focal
|
||||
distro: ubuntu_bionic
|
||||
|
||||
- job:
|
||||
name: deckhand-airskiff-deployment-focal
|
||||
@ -300,7 +332,7 @@
|
||||
- airship/treasuremap
|
||||
vars:
|
||||
CLONE_DECKHAND: false
|
||||
OSH_INFRA_COMMIT: 443ff3e3e340c94c5cbb214d1e2a8b2a3937541d
|
||||
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
|
||||
DECKHAND_IMAGE_DISTRO: ubuntu_focal
|
||||
distro: ubuntu_focal
|
||||
irrelevant-files:
|
||||
@ -324,7 +356,7 @@
|
||||
- airship/treasuremap
|
||||
vars:
|
||||
CLONE_DECKHAND: false
|
||||
OSH_INFRA_COMMIT: 443ff3e3e340c94c5cbb214d1e2a8b2a3937541d
|
||||
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
|
||||
DECKHAND_IMAGE_DISTRO: ubuntu_bionic
|
||||
distro: ubuntu_focal
|
||||
irrelevant-files:
|
||||
|
||||
@ -38,7 +38,7 @@ Paste<=3.5.0
|
||||
PasteDeploy
|
||||
PasteScript
|
||||
pbr<=5.5.1
|
||||
psycopg2-binary
|
||||
psycopg2-binary<2.9.8
|
||||
pycadf<=3.1.1
|
||||
pycodestyle<=2.6.0
|
||||
pyflakes<=2.2.0
|
||||
@ -75,3 +75,4 @@ Werkzeug
|
||||
wheel
|
||||
wsgi-intercept>=1.2.2
|
||||
yq==3.2.1
|
||||
xattr==0.10.1
|
||||
@ -17,7 +17,7 @@ cmd2==2.4.3
|
||||
configparser==5.2.0
|
||||
coverage==6.2
|
||||
cryptography==3.4.8
|
||||
dataclasses==0.8
|
||||
dataclasses==0.6
|
||||
debtcollector==2.5.0
|
||||
decorator==4.4.2
|
||||
deepdiff==5.7.0
|
||||
@ -154,3 +154,4 @@ xmltodict==0.13.0
|
||||
yappi==1.4.0
|
||||
yq==3.2.1
|
||||
zipp==3.6.0
|
||||
xattr==0.10.1
|
||||
@ -1,109 +1,110 @@
|
||||
alabaster==0.7.13
|
||||
alembic==1.4.3
|
||||
amqp==2.6.1
|
||||
argcomplete==3.0.8
|
||||
attrs==23.1.0
|
||||
autopage==0.5.1
|
||||
Babel==2.12.1
|
||||
bcrypt==4.0.1
|
||||
argcomplete==3.2.2
|
||||
attrs==23.2.0
|
||||
autopage==0.5.2
|
||||
Babel==2.14.0
|
||||
bcrypt==4.1.2
|
||||
Beaker==1.12.0
|
||||
cachetools==5.3.0
|
||||
certifi==2022.12.7
|
||||
cffi==1.15.1
|
||||
cachetools==5.3.2
|
||||
certifi==2024.2.2
|
||||
cffi==1.16.0
|
||||
chardet==3.0.4
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==3.3.2
|
||||
cliff==3.10.1
|
||||
cmd2==2.4.3
|
||||
configparser==5.3.0
|
||||
coverage==7.2.3
|
||||
configparser==6.0.0
|
||||
coverage==7.4.1
|
||||
cryptography==3.4.8
|
||||
debtcollector==2.5.0
|
||||
decorator==5.1.1
|
||||
deepdiff==5.8.1
|
||||
distlib==0.3.6
|
||||
dnspython==2.3.0
|
||||
distlib==0.3.8
|
||||
dnspython==2.5.0
|
||||
docutils==0.17
|
||||
dogpile.cache==1.1.8
|
||||
dulwich==0.21.3
|
||||
eventlet==0.33.3
|
||||
dogpile.cache==1.2.1
|
||||
dulwich==0.21.7
|
||||
eventlet==0.35.1
|
||||
extras==1.0.0
|
||||
falcon==3.1.1
|
||||
fasteners==0.18
|
||||
filelock==3.12.0
|
||||
falcon==3.1.3
|
||||
fasteners==0.19
|
||||
filelock==3.13.1
|
||||
fixtures==3.0.0
|
||||
flake8==3.8.4
|
||||
futurist==2.4.1
|
||||
greenlet==2.0.2
|
||||
greenlet==3.0.3
|
||||
hacking==4.1.0
|
||||
html5lib==0.9999999
|
||||
httpexceptor==1.4.0
|
||||
idna==2.10
|
||||
imagesize==1.4.1
|
||||
importlib-metadata==2.1.3
|
||||
iso8601==1.1.0
|
||||
iso8601==2.1.0
|
||||
Jinja2==3.0.3
|
||||
jsonpath-ng==1.5.3
|
||||
jsonpath-ng==1.6.1
|
||||
jsonpath-rw==1.4.0
|
||||
jsonpath-rw-ext==1.2.2
|
||||
jsonpickle==1.4.1
|
||||
jsonschema==3.2.0
|
||||
keystoneauth1==5.1.1
|
||||
keystonemiddleware==10.2.0
|
||||
keystonemiddleware==10.5.0
|
||||
kombu==4.6.11
|
||||
Mako==1.2.4
|
||||
Mako==1.3.2
|
||||
MarkupSafe==2.0.1
|
||||
mccabe==0.6.1
|
||||
msgpack==1.0.5
|
||||
netaddr==0.8.0
|
||||
msgpack==1.0.7
|
||||
netaddr==1.1.0
|
||||
netifaces==0.11.0
|
||||
networkx==3.1
|
||||
nose==1.3.7
|
||||
ordered-set==4.1.0
|
||||
os-service-types==1.7.0
|
||||
oslo.cache==2.10.1
|
||||
oslo.concurrency==5.1.1
|
||||
oslo.concurrency==5.3.0
|
||||
oslo.config==8.7.1
|
||||
oslo.context==4.1.0
|
||||
oslo.db==10.0.0
|
||||
oslo.i18n==6.0.0
|
||||
oslo.i18n==6.2.0
|
||||
oslo.log==4.6.0
|
||||
oslo.messaging==12.13.0
|
||||
oslo.metrics==0.6.0
|
||||
oslo.metrics==0.7.0
|
||||
oslo.middleware==4.4.0
|
||||
oslo.policy==3.10.1
|
||||
oslo.serialization==4.2.0
|
||||
oslo.service==3.1.1
|
||||
oslo.service==3.3.0
|
||||
oslo.utils==4.12.3
|
||||
packaging==21.3
|
||||
Paste==3.5.0
|
||||
PasteDeploy==3.0.1
|
||||
PasteScript==3.3.0
|
||||
PasteDeploy==3.1.0
|
||||
PasteScript==3.4.0
|
||||
pbr==5.5.1
|
||||
pip==23.0.1
|
||||
platformdirs==3.2.0
|
||||
pip==23.3.1
|
||||
platformdirs==4.2.0
|
||||
ply==3.11
|
||||
prettytable==3.7.0
|
||||
prometheus-client==0.16.0
|
||||
psycopg2-binary==2.9.6
|
||||
prettytable==3.9.0
|
||||
prometheus_client==0.20.0
|
||||
psycopg2-binary==2.9.7
|
||||
pycadf==3.1.1
|
||||
pycodestyle==2.6.0
|
||||
pycparser==2.21
|
||||
pyflakes==2.2.0
|
||||
Pygments==2.14.0
|
||||
PyJWT==2.8.0
|
||||
pylibyaml==0.1.0
|
||||
pymongo==4.3.3
|
||||
pymongo==4.6.1
|
||||
pyparsing==2.4.7
|
||||
pyperclip==1.8.2
|
||||
pyproject_api==1.5.0
|
||||
pyrsistent==0.19.3
|
||||
pyrsistent==0.20.0
|
||||
python-barbicanclient==5.2.0
|
||||
python-dateutil==2.8.1
|
||||
python-editor==1.0.4
|
||||
python-keystoneclient==5.1.0
|
||||
python-memcached==1.59
|
||||
python-keystoneclient==5.3.0
|
||||
python-memcached==1.62
|
||||
python-mimeparse==1.6.0
|
||||
python-subunit==1.4.0
|
||||
pytz==2023.3
|
||||
pytz==2024.1
|
||||
PyYAML==5.4.1
|
||||
reno==4.0.0
|
||||
repoze.lru==0.7
|
||||
@ -113,7 +114,7 @@ rfc3986==2.0.0
|
||||
Routes==2.5.1
|
||||
selector==0.10.1
|
||||
setuptools==45.2.0
|
||||
simplejson==3.19.1
|
||||
simplejson==3.19.2
|
||||
six==1.16.0
|
||||
snowballstemmer==2.2.0
|
||||
Sphinx==3.3.1
|
||||
@ -128,7 +129,7 @@ SQLAlchemy==1.3.20
|
||||
sqlalchemy-migrate==0.13.0
|
||||
sqlparse==0.4.4
|
||||
statsd==4.0.1
|
||||
stevedore==5.0.0
|
||||
stevedore==5.1.0
|
||||
Tempita==0.5.2
|
||||
testrepository==0.0.20
|
||||
testresources==2.0.1
|
||||
@ -136,19 +137,20 @@ testscenarios==0.5.0
|
||||
testtools==2.5.0
|
||||
tiddlyweb==2.4.3
|
||||
tomli==2.0.1
|
||||
tomlkit==0.11.7
|
||||
tomlkit==0.12.3
|
||||
typing-extensions==3.7.4.3
|
||||
urllib3==1.25.11
|
||||
uWSGI==2.0.21
|
||||
vine==1.3.0
|
||||
virtualenv==20.22.0
|
||||
wcwidth==0.2.6
|
||||
virtualenv==20.25.0
|
||||
wcwidth==0.2.13
|
||||
WebOb==1.8.7
|
||||
Werkzeug==2.1.2
|
||||
wheel==0.40.0
|
||||
wrapt==1.15.0
|
||||
wsgi-intercept==1.11.0
|
||||
wheel==0.42.0
|
||||
wrapt==1.16.0
|
||||
wsgi-intercept==1.13.0
|
||||
xattr==0.10.1
|
||||
xmltodict==0.13.0
|
||||
yappi==1.4.0
|
||||
yappi==1.6.0
|
||||
yq==3.2.1
|
||||
zipp==3.15.0
|
||||
zipp==3.17.0
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
- ensure-pip
|
||||
- disable-systemd-resolved
|
||||
- install-test-requirements
|
||||
- build-images
|
||||
- deploy-keystone-dependencies
|
||||
- deploy-barbican
|
||||
- build-charts
|
||||
@ -31,6 +30,7 @@
|
||||
# deploy-keystone-dependencies which restarts Docker, causing
|
||||
# the first 2 containers that are deployed to fail.
|
||||
- deploy-postgresql
|
||||
- build-images
|
||||
- generate-test-config
|
||||
- deploy-deckhand
|
||||
- run-integration-tests
|
||||
|
||||
@ -17,30 +17,49 @@
|
||||
set_fact:
|
||||
zuul_site_mirror_fqdn: "{{ lookup('env','zuul_site_mirror_fqdn') }}"
|
||||
|
||||
- name: Deploy Required Packages
|
||||
- name: Checkout treasuremap v1.9 branch
|
||||
shell: |
|
||||
set -xe;
|
||||
./tools/deployment/common/install-packages.sh
|
||||
git checkout v1.9
|
||||
environment:
|
||||
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_treasuremap_relative_path | default('') }}"
|
||||
|
||||
- name: Deploy Kubernetes
|
||||
shell: |
|
||||
set -xe;
|
||||
./tools/deployment/common/deploy-k8s.sh
|
||||
./tools/deployment/airskiff/developer/010-deploy-k8s.sh
|
||||
environment:
|
||||
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_treasuremap_relative_path | default('') }}"
|
||||
|
||||
- name: Make OSH charts
|
||||
shell: |
|
||||
set -xe
|
||||
make all
|
||||
environment:
|
||||
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
|
||||
|
||||
- name: Setup OS and Kubernetes Clients
|
||||
- name: Make OSH_INFRA charts
|
||||
shell: |
|
||||
set -xe
|
||||
make all
|
||||
environment:
|
||||
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
||||
|
||||
|
||||
- name: Setup docker-based openstack client
|
||||
shell: |
|
||||
set -xe;
|
||||
./tools/deployment/common/setup-client.sh
|
||||
./tools/deployment/airskiff/developer/020-setup-client.sh
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
|
||||
chdir: "{{ zuul.project.src_dir }}/{{ zuul_treasuremap_relative_path | default('') }}"
|
||||
|
||||
- name: Deploy Ingress
|
||||
shell: |
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
set -eux
|
||||
|
||||
HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"}
|
||||
HTK_STABLE_COMMIT=${HTK_COMMIT:-"443ff3e3e340c94c5cbb214d1e2a8b2a3937541d"}
|
||||
HTK_STABLE_COMMIT=${HTK_COMMIT:-"cfff60ec10a6c386f38db79bb9f59a552c2b032f"}
|
||||
|
||||
TMP_DIR=$(mktemp -d)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user