openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Prune CI jobs 

Change-Id: I4260d8c4ea6e5a7cedca4231dec42d0700e25638
This commit is contained in:
Peter Sabaini 2023-09-11 12:31:22 +02:00
parent 4bc15968fe
commit 4d36f6cbc3
6 changed files with 11 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
osci.yaml
View File

@ -1,24 +1,18 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-unit-jobs-py310
check:
jobs:
- vault-focal-yoga_rgw
- vault-focal-yoga-namespaced
- focal-yoga-multisite
- jammy-yoga-multisite
- jammy-antelope-multisite:
voting: false
- jammy-bobcat-multisite:
voting: false
- lunar-antelope-multisite:
voting: false
- mantic-bobcat-multisite:
voting: false
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- vault-jammy-antelope_rgw:
voting: false
- vault-jammy-antelope-namespaced:
@ -27,10 +21,6 @@
voting: false
- vault-jammy-bobcat-namespaced:
voting: false
- vault-lunar-antelope_rgw:
voting: false
- vault-lunar-antelope-namespaced:
voting: false
- vault-mantic-bobcat_rgw:
voting: false
- vault-mantic-bobcat-namespaced:
@ -47,47 +37,27 @@
- osci-lint
- charm-build
- tox-py38
- tox-py39
- name: tox-py310
soft: true
vars:
tox_extra_args: '-- focal-yoga-multisite'
- job:
name: jammy-yoga-multisite
parent: func-target
dependencies:
- osci-lint
- charm-build
- name: tox-py310
soft: true
vars:
tox_extra_args: '-- jammy-yoga-multisite'
- job:
name: jammy-antelope-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
- focal-yoga-multisite
vars:
tox_extra_args: '-- jammy-antelope-multisite'
- job:
name: jammy-bobcat-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
- jammy-antelope-multisite
vars:
tox_extra_args: '-- jammy-bobcat-multisite'
- job:
name: lunar-antelope-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- lunar-antelope-multisite'
- job:
name: mantic-bobcat-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
- jammy-antelope-multisite
vars:
tox_extra_args: '-- mantic-bobcat-multisite'
- job:
@ -97,13 +67,6 @@
- focal-yoga-multisite
vars:
tox_extra_args: '-- vault:focal-yoga'
- job:
name: vault-jammy-yoga_rgw
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- vault:jammy-yoga'
- job:
name: vault-focal-yoga-namespaced
parent: func-target
@ -111,72 +74,45 @@
- focal-yoga-multisite
vars:
tox_extra_args: '-- vault:focal-yoga-namespaced'
- job:
name: vault-jammy-yoga-namespaced
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- vault:jammy-yoga-namespaced'
- job:
name: vault-jammy-antelope-namespaced
parent: func-target
dependencies:
- jammy-yoga-multisite
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-antelope-namespaced'
- job:
name: vault-jammy-bobcat-namespaced
parent: func-target
dependencies:
- jammy-yoga-multisite
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-bobcat-namespaced'
- job:
name: vault-jammy-antelope_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-antelope'
- job:
name: vault-jammy-bobcat_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:jammy-bobcat'
- job:
name: vault-lunar-antelope-namespaced
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:lunar-antelope-namespaced'
- job:
name: vault-mantic-bobcat-namespaced
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:mantic-bobcat-namespaced'
- job:
name: vault-lunar-antelope_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:lunar-antelope'
- job:
name: vault-mantic-bobcat_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:mantic-bobcat'

99
tests/bundles/jammy-yoga-multisite.yaml
View File

@ -1,99 +0,0 @@
options:
source: &source distro
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
'9':
applications:
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '0'
secondary-ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '1'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '2'
- '6'
- '7'
channel: latest/edge
secondary-ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '3'
- '8'
- '9'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '4'
channel: latest/edge
secondary-ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '5'
channel: latest/edge
relations:
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'secondary-ceph-osd:mon'
- 'secondary-ceph-mon:osd'
- - 'secondary-ceph-radosgw:mon'
- 'secondary-ceph-mon:radosgw'

124
tests/bundles/jammy-yoga-namespaced.yaml
View File

@ -1,124 +0,0 @@
options:
source: &source distro
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
namespace-tenants: True
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

123
tests/bundles/jammy-yoga.yaml
View File

@ -1,123 +0,0 @@
options:
source: &source distro
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

123
tests/bundles/lunar-antelope.yaml
View File

@ -1,123 +0,0 @@
options:
source: &source cloud:lunar-antelope
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

10
tests/tests.yaml
View File

@ -1,25 +1,19 @@
charm_name: ceph-radosgw
gate_bundles:
- jammy-yoga-multisite
- vault: jammy-yoga
- vault: jammy-yoga-namespaced
- focal-yoga-multisite
- vault: focal-yoga
- vault: focal-yoga-namespaced
smoke_bundles:
- jammy-yoga-multisite
- vault: jammy-yoga
- jammy-antelope-multisite
- vault: jammy-antelope
dev_bundles:
- jammy-yoga-multisite
- lunar-antelope-multisite
- mantic-bobcat-multisite
- jammy-antelope-multisite
- jammy-bobcat-multisite
- vault: jammy-yoga
- vault: jammy-yoga-namespaced
- vault: lunar-antelope
- vault: mantic-bobcat
- vault: lunar-antelope-namespaced