Merge branch 'main' into apache2-vhost-formatting

canonical · Nov 27, 2023 · 1035985 · 1035985
2 parents dfab3fa + c766633
commit 1035985
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 35 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -76,10 +76,9 @@ class _ReplicaRelationNotReady(Exception):
         "resource-centre",
         "thematic",
         "twentyeleven",
-        "twentytwenty",
-        "twentytwentyone",
-        "twentytwentytwo",
+        "twentytwentyfour",
         "twentytwentythree",
+        "twentytwentytwo",
         "ubuntu-cloud-website",
         "ubuntu-community-wordpress-theme/ubuntu-community",
         "ubuntu-community/ubuntu-community",
@@ -103,6 +102,7 @@ class _ReplicaRelationNotReady(Exception):
         "favicon-by-realfavicongenerator",
         "feedwordpress",
         "genesis-columns-advanced",
+        "hello",
         "line-break-shortcode",
         "wp-mastodon-share",
         "no-category-base-wpml",
@@ -383,8 +383,7 @@ def _gen_wp_config(self):
             define( 'WP_CONTENT_URL', $_w_p_http_protocol . $_SERVER['HTTP_HOST'] . '/wp-content' );
             define( 'WP_SITEURL', $_w_p_http_protocol . $_SERVER['HTTP_HOST'] );
             define( 'WP_URL', $_w_p_http_protocol . $_SERVER['HTTP_HOST'] );
-            define( 'WP_HOME', $_w_p_http_protocol . $_SERVER['HTTP_HOST'] );
-            define( 'WP_DEFAULT_THEME', "twentytwentythree" );"""
+            define( 'WP_HOME', $_w_p_http_protocol . $_SERVER['HTTP_HOST'] );"""
             )
         ]
 

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -219,7 +219,9 @@ async def prepare_nginx_ingress(wordpress: WordpressApp, prepare_mysql):
 @pytest_asyncio.fixture(scope="module")
 async def prepare_prometheus(wordpress: WordpressApp, prepare_mysql):
     """Deploy and relate prometheus-k8s charm for integration tests."""
-    prometheus = await wordpress.model.deploy("prometheus-k8s", channel="1.0/stable", trust=True)
+    prometheus = await wordpress.model.deploy(
+        "prometheus-k8s", channel="1.0/stable", revision=129, series="focal", trust=True
+    )
     await wordpress.model.wait_for_idle(
         status="active", apps=[prometheus.name], raise_on_error=False, timeout=30 * 60
     )

diff --git a/tests/integration/helper.py b/tests/integration/helper.py
@@ -115,9 +115,7 @@ def run_wordpress_functionality_test(cls, host: str, admin_username: str, admin_
             content=post_content,
         )
         homepage = wp_client.get_homepage()
-        assert (
-            post_title in homepage and post_content in homepage
-        ), "admin user should be able to create a new post"
+        assert post_title in homepage, "admin user should be able to create a new post"
         comment = secrets.token_hex(16)
         post_link = post["link"]
         comment_link = wp_client.create_comment(

diff --git a/tests/integration/test_core.py b/tests/integration/test_core.py
@@ -13,7 +13,6 @@
 import requests
 from pytest_operator.plugin import OpsTest
 
-from charm import WordpressCharm
 from tests.integration.helper import WordpressApp, WordpressClient
 
 
@@ -93,28 +92,6 @@ async def test_openstack_object_storage_plugin(
             ), "image downloaded from WordPress should match the image uploaded"
 
 
-@pytest.mark.usefixtures("prepare_mysql", "prepare_swift")
-async def test_default_wordpress_themes_and_plugins(wordpress: WordpressApp):
-    """
-    arrange: after WordPress charm has been deployed and db relation established.
-    act: test default installed themes and plugins.
-    assert: default plugins and themes should match default themes and plugins defined in charm.py.
-    """
-    for unit_ip in await wordpress.get_unit_ips():
-        wordpress_client = WordpressClient(
-            host=unit_ip,
-            username="admin",
-            password=await wordpress.get_default_admin_password(),
-            is_admin=True,
-        )
-        assert set(wordpress_client.list_themes()) == set(
-            WordpressCharm._WORDPRESS_DEFAULT_THEMES
-        ), "themes installed on WordPress should match default themes defined in charm.py"
-        assert set(wordpress_client.list_plugins()) == set(
-            WordpressCharm._WORDPRESS_DEFAULT_PLUGINS
-        ), "plugins installed on WordPress should match default plugins defined in charm.py"
-
-
 @pytest.mark.usefixtures("prepare_mysql", "prepare_swift")
 async def test_apache_config(wordpress: WordpressApp, ops_test: OpsTest):
     """

diff --git a/tests/integration/test_cos_grafana.py b/tests/integration/test_cos_grafana.py
@@ -42,7 +42,9 @@ async def test_grafana_integration(
     act: grafana charm joins relation
     assert: grafana wordpress dashboard can be found
     """
-    grafana = await wordpress.model.deploy("grafana-k8s", channel="1.0/stable", trust=True)
+    grafana = await wordpress.model.deploy(
+        "grafana-k8s", channel="1.0/stable", revision=82, series="focal", trust=True
+    )
     await wordpress.model.wait_for_idle(status="active", apps=["grafana-k8s"], timeout=20 * 60)
     await wordpress.model.add_relation("wordpress-k8s:grafana-dashboard", "grafana-k8s")
     await wordpress.model.wait_for_idle(

diff --git a/wordpress_rock/rockcraft.yaml b/wordpress_rock/rockcraft.yaml
@@ -81,8 +81,6 @@ parts:
       mkdir -p wordpress_install_dir
       (cd wordpress_install_dir; $CRAFT_PART_BUILD/wp core download --version=${WP_VERSION} --allow-root)
 
-      rm -rf wordpress_install_dir/wp-content/themes/twentytwentythree
-      rm -rf wordpress_install_dir/wp-content/themes/twentytwentyfour
       cp -R . $CRAFT_PART_INSTALL
     organize:
       wordpress_install_dir: /var/www/html