From 5a59ffd3c985ab3e50843a15edaf5ad85dc27c92 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 11 Jul 2023 10:00:43 +0000 Subject: [PATCH] Switch to usinging consolidated rock Change-Id: Ic2b6578c6d8a5305efb1fad39a6f46f989f8b53d --- charms/nova-k8s/metadata.yaml | 6 +++--- charms/nova-k8s/tests/bundles/smoke.yaml | 6 +++--- charms/nova-k8s/tox.ini | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charms/nova-k8s/metadata.yaml b/charms/nova-k8s/metadata.yaml index e1ea6ab0..170b446d 100644 --- a/charms/nova-k8s/metadata.yaml +++ b/charms/nova-k8s/metadata.yaml @@ -37,15 +37,15 @@ resources: nova-api-image: type: oci-image description: OCI image for OpenStack Nova API - upstream-source: ghcr.io/openstack-snaps/nova-api:2023.1 + upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 nova-scheduler-image: type: oci-image description: OCI image for OpenStack Nova Scheduler - upstream-source: ghcr.io/openstack-snaps/nova-scheduler:2023.1 + upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 nova-conductor-image: type: oci-image description: OCI image for OpenStack Nova Conductor - upstream-source: ghcr.io/openstack-snaps/nova-conductor:2023.1 + upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 requires: ingress-internal: diff --git a/charms/nova-k8s/tests/bundles/smoke.yaml b/charms/nova-k8s/tests/bundles/smoke.yaml index 58622a8d..03225755 100644 --- a/charms/nova-k8s/tests/bundles/smoke.yaml +++ b/charms/nova-k8s/tests/bundles/smoke.yaml @@ -45,9 +45,9 @@ applications: scale: 1 trust: true resources: - nova-api-image: ghcr.io/openstack-snaps/nova-api:2023.1 - nova-scheduler-image: ghcr.io/openstack-snaps/nova-scheduler:2023.1 - nova-conductor-image: ghcr.io/openstack-snaps/nova-conductor:2023.1 + nova-api-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + nova-scheduler-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + nova-conductor-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 placement: charm: ch:placement-k8s diff --git a/charms/nova-k8s/tox.ini b/charms/nova-k8s/tox.ini index a24b3692..b059eeff 100644 --- a/charms/nova-k8s/tox.ini +++ b/charms/nova-k8s/tox.ini @@ -127,7 +127,7 @@ commands = [testenv:func-smoke] basepython = python3 setenv = - TEST_MODEL_SETTINGS = automatically-retry-hooks=true + TEST_MODEL_SETTINGS = automatically-retry-hooks=true;update-status-hook-interval=1m TEST_MAX_RESOLVE_COUNT = 5 commands = functest-run-suite --keep-model --smoke