Merge pull request #596 from ZeitOnline/ZO-4519

ZO-4519: Convert to json-patch for marginally more readable spelling
ZeitOnline · Jan 25, 2024 · fba97c0 · fba97c0
2 parents 6b05823 + 36b085e
commit fba97c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/nightwatch.yaml b/.github/workflows/nightwatch.yaml
@@ -18,20 +18,17 @@ jobs:
     secrets: inherit
     with:
       versions: smoketest/k8s/base/versions
-      # copy&paste from k8s/base and k8s/staging manifest;
-      # the json/shell quoting is atrocious.
+      # copy&paste from k8s/base and k8s/staging manifest
       args: |
-        --override-type=strategic --overrides="{\"spec\": {
-          \"serviceAccount\": \"baseproject\",
-          \"containers\": [{
-            \"name\": \"nightwatch-test-$TAG\",
-            \"env\": [
-                {\"name\": \"HTTPS_PROXY\", \"value\": \"http://static-ip-proxy.ops.zeit.de:3128\"},
-                {\"name\": \"VIVI_XMLRPC_PASSWORD\", \"valueFrom\": {\"secretKeyRef\": {
-                  \"name\": \"principals\",
-                  \"key\": \"vivi_zeit.cms.principals_system.nightwatch\"
-                }}}
-            ]
-          }] }}"
+        --override-type=json --overrides='[
+          {"op": "add", "path": "/spec/serviceAccount", "value": "baseproject"},
+          {"op": "add", "path": "/spec/containers/0/env", "value": [
+            {"name": "HTTPS_PROXY", "value": "http://static-ip-proxy.ops.zeit.de:3128"},
+            {"name": "VIVI_XMLRPC_PASSWORD", "valueFrom": {"secretKeyRef": {
+              "name": "principals",
+              "key": "vivi_zeit.cms.principals_system.nightwatch"
+            }}}
+          ]}
+        ]'
 
   # deploy happens via flux (on `main` branch)
diff --git a/smoketest/conftest.py b/smoketest/conftest.py
@@ -40,10 +40,10 @@ def config(nightwatch_config):  # shorter spelling for our tests
 
 
 def pytest_configure(config):
-    config.option.prometheus_job_name = 'vivi-deployment-%s' % config.option.nightwatch_environment
+    config.option.prometheus_job_name = 'vivi-%s' % config.option.nightwatch_environment
     if config.option.prometheus_extra_labels is None:
         config.option.prometheus_extra_labels = []
-    config.option.prometheus_extra_labels.append('project=vivi-deployment')
+    config.option.prometheus_extra_labels.append('project=vivi')
 
 
 class ViviClient: