Rename environment variables and temporarily disable arm builds

canonical · Jul 8, 2024 · 965ff42 · 965ff42
1 parent 652868d
commit 965ff42
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.rock
-*/__pycache__
+**/__pycache__
 .pytest_cache
 .venv
 .tox
diff --git a/acmesolver/rockcraft.yaml b/acmesolver/rockcraft.yaml
@@ -9,7 +9,6 @@ base: bare
 build-base: [email protected]
 platforms:
   amd64:
-  arm64:
 
 entrypoint-service: cert-manager-acmesolver
 services:

diff --git a/cainjector/rockcraft.yaml b/cainjector/rockcraft.yaml
@@ -9,7 +9,6 @@ base: bare
 build-base: [email protected]
 platforms:
   amd64:
-  arm64:
 
 entrypoint-service: cert-manager-cainjector
 services:

diff --git a/controller/rockcraft.yaml b/controller/rockcraft.yaml
@@ -9,7 +9,6 @@ base: bare
 build-base: [email protected]
 platforms:
   amd64:
-  arm64:
 
 entrypoint-service: cert-manager-controller
 services:

diff --git a/tests/sanity/test_acmesolver.py b/tests/sanity/test_acmesolver.py
@@ -3,8 +3,8 @@
 
 
 def test_sanity_acmesolver():
-    image = os.getenv("ROCK_CERT-MANAGER-ACMESOLVER")
-    assert image is not None, "ROCK_CERT-MANAGER-ACMESOLVER is not set"
+    image = os.getenv("ROCK_CERT_MANAGER_ACMESOLVER")
+    assert image is not None, "ROCK_CERT_MANAGER_ACMESOLVER is not set"
     docker_run = subprocess.run(
         ["docker", "run", "--rm", "--entrypoint", "/acmesolver-linux", image, "--help"],
         capture_output=True,

diff --git a/tests/sanity/test_cainjector.py b/tests/sanity/test_cainjector.py
@@ -3,8 +3,8 @@
 
 
 def test_sanity_cainjector():
-    image = os.getenv("ROCK_CERT-MANAGER-CAINJECTOR")
-    assert image is not None, "ROCK_CERT-MANAGER-CAINJECTOR is not set"
+    image = os.getenv("ROCK_CERT_MANAGER_CAINJECTOR")
+    assert image is not None, "ROCK_CERT_MANAGER_CAINJECTOR is not set"
     docker_run = subprocess.run(
         ["docker", "run", "--rm", "--entrypoint", "/cainjector-linux", image, "--help"],
         capture_output=True,

diff --git a/tests/sanity/test_controller.py b/tests/sanity/test_controller.py
@@ -3,8 +3,8 @@
 
 
 def test_sanity_controller():
-    image = os.getenv("ROCK_CERT-MANAGER-CONTROLLER")
-    assert image is not None, "ROCK_CERT-MANAGER-CONTROLLER is not set"
+    image = os.getenv("ROCK_CERT_MANAGER_CONTROLLER")
+    assert image is not None, "ROCK_CERT_MANAGER_CONTROLLER is not set"
     docker_run = subprocess.run(
         ["docker", "run", "--rm", "--entrypoint", "/controller-linux", image, "--help"],
         capture_output=True,

diff --git a/tests/sanity/test_webhook.py b/tests/sanity/test_webhook.py
@@ -3,8 +3,8 @@
 
 
 def test_sanity_webhook():
-    image = os.getenv("ROCK_CERT-MANAGER-WEBHOOK")
-    assert image is not None, "ROCK_CERT-MANAGER-WEBHOOK is not set"
+    image = os.getenv("ROCK_CERT_MANAGER_WEBHOOK")
+    assert image is not None, "ROCK_CERT_MANAGER_WEBHOOK is not set"
     docker_run = subprocess.run(
         ["docker", "run", "--rm", "--entrypoint", "/webhook-linux", image, "--help"],
         capture_output=True,

diff --git a/webhook/rockcraft.yaml b/webhook/rockcraft.yaml
@@ -9,7 +9,6 @@ base: bare
 build-base: [email protected]
 platforms:
   amd64:
-  arm64:
 
 entrypoint-service: cert-manager-webhook
 services: