Skip to content

Commit

Permalink
use zuul for molecule jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
ricolin committed Apr 17, 2024
1 parent b623888 commit d07a84c
Show file tree
Hide file tree
Showing 10 changed files with 316 additions and 231 deletions.
231 changes: 0 additions & 231 deletions .github/workflows/molecule.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
__pycache__
tests/output
.stestr
.tox
5 changes: 5 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
molecule
molecule-plugins[docker]
oslotest
stestr
testscenarios
30 changes: 30 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[tox]
minversion = 4

[testenv]
usedevelop = True
setenv =
VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE=1
deps =
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt

[testenv:venv]
passenv =
MOLECULE_CEPH_VERSION
MOLECULE_DISTRO
commands =
{posargs}

[testenv:molecule-aio]
tetenv =
MOLECULE_CEPH_FSID = 1945b3ba-075d-4c35-9c60-315752d5f978
commands =
molecule test -s aio

[testenv:molecule-ha]
tetenv =
MOLECULE_CEPH_FSID = d8f45527-69bb-40fa-84da-52f4f292589b
commands =
molecule test -s ha
123 changes: 123 additions & 0 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# Copyright (c) 2024 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

- job:
name: ceph-molecule
parent: tox
abstract: true
pre-run: zuul.d/playbooks/molecule/pre.yml
run: zuul.d/playbooks/molecule/run.yml
post-run: zuul.d/playbooks/molecule/post.yml

# aio jobs
- job:
name: ceph-molecule-aio-base
abstract: true
parent: ceph-molecule
vars:
molecule_distro: ubuntu2204
tox_envlist: molecule-aio

- job:
name: ceph-molecule-aio-2004-base
abstract: true
parent: ceph-molecule-aio-base
vars:
molecule_distro: ubuntu2004

- job:
name: ceph-molecule-aio-18
parent: ceph-molecule-aio-base
vars:
molecule_ceph_version: 18.2.1

- job:
name: ceph-molecule-aio-2004-18
parent: ceph-molecule-aio-2004-base
vars:
molecule_ceph_version: 18.2.1

- job:
name: ceph-molecule-aio-2004-17
parent: ceph-molecule-aio-2004-base
vars:
molecule_ceph_version: 17.2.7

- job:
name: ceph-molecule-aio-2004-16
parent: ceph-molecule-aio-2004-base
vars:
molecule_ceph_version: 16.2.14

# ha jobs
- job:
name: ceph-molecule-ha-base
abstract: true
parent: ceph-molecule
vars:
molecule_distro: ubuntu2204
tox_envlist: molecule-ha

- job:
name: ceph-molecule-ha-2004-base
abstract: true
parent: ceph-molecule-ha-base
vars:
molecule_distro: ubuntu2004

- job:
name: ceph-molecule-ha-18
parent: ceph-molecule-ha-base
vars:
molecule_ceph_version: 18.2.1

- job:
name: ceph-molecule-ha-2004-18
parent: ceph-molecule-ha-2004-base
vars:
molecule_ceph_version: 18.2.1

- job:
name: ceph-molecule-ha-2004-17
parent: ceph-molecule-ha-2004-base
vars:
molecule_ceph_version: 17.2.7

- job:
name: ceph-molecule-ha-2004-16
parent: ceph-molecule-ha-2004-base
vars:
molecule_ceph_version: 16.2.14

# upgrade-adopt jobs
- job:
name: ceph-molecule-adopt-upgrade-16-18
parent: ceph-molecule
pre-run: zuul.d/playbooks/molecule-upgrade/pre.yml
vars:
molecule_pre_ceph_version: 16.2.14
molecule_ceph_version: 18.2.1
molecule_distro: ubuntu2004
tox_envlist: molecule-ha
timeout: 7200
nodeset:
nodes:
- name: ubuntu-jammy
label: jammy-16c-64g

- job:
name: ceph-molecule-adopt-upgrade-17-18
parent: ceph-molecule-adopt-upgrade-16-18
vars:
molecule_pre_ceph_version: 17.2.7
Loading

0 comments on commit d07a84c

Please sign in to comment.