Skip to content

Commit 1361bde

Browse files
ycliuhwycliuhw
committed
upgrade caas testing charms and pull from charmstore because charmstore support caas charms now; delete local charms;
1 parent a70ac52 commit 1361bde

File tree

97 files changed

+10
-4536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+10
-4536
lines changed

‎acceptancetests/assess_caas_deploy_charms.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,22 @@ def assess_caas_charm_deployment(client):
204204
('operator-storage', 'kubernetes', 'storage-class=%s' % JUJU_STORAGECLASS_NAME)
205205
)
206206

207-
gitlab_charm_path = local_charm_path(charm='caas-gitlab', juju_ver=client.version)
208207
k8s_model.deploy(
209-
charm=gitlab_charm_path, config='juju-external-hostname={}'.format(external_hostname)
208+
charm="cs:~juju/gitlab-k8s-0",
209+
config='juju-external-hostname={}'.format(external_hostname),
210+
resource="gitlab_image=gitlab/gitlab-ce:11.0.6-ce.0",
210211
)
211212

212-
mysql_charm_path = local_charm_path(charm='caas-mysql', juju_ver=client.version)
213-
k8s_model.deploy(charm=mysql_charm_path)
213+
k8s_model.deploy(
214+
charm="cs:~juju/mariadb-k8s-0",
215+
resource="mysql_image=mysql/mysql-server:5.7",
216+
)
214217

215-
k8s_model.juju('relate', ('gitlab', 'mysql'))
216-
k8s_model.juju('expose', ('gitlab',))
218+
k8s_model.juju('relate', ('mariadb-k8s', 'gitlab-k8s'))
219+
k8s_model.juju('expose', ('gitlab-k8s',))
217220
k8s_model.wait_for_workloads(timeout=3600)
218221

219-
url = '{}://{}/{}'.format('http', external_hostname, 'gitlab')
222+
url = '{}://{}/{}'.format('http', external_hostname, 'gitlab-k8s')
220223
check_app_healthy(url, timeout=1200)
221224

222225
log.info(caas_client.kubectl('get', 'all', '--all-namespaces'))

0 commit comments

Comments
 (0)