Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZO-4519: Convert to json-patch for marginally more readable spelling #596

Merged
merged 2 commits into from
Jan 25, 2024
Merged

ZO-4519: Convert to json-patch for marginally more readable spelling #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7928cbf
ZO-4519: Update metric label
wosc Jan 25, 2024
36b085e
ZO-4519: Convert to json-patch for marginally more readable spelling
wosc Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions .github/workflows/nightwatch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions smoketest/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down