diff --git a/ci/Jenkinsfile.hermes-voice-image b/ci/Jenkinsfile.hermes-voice-image index 03a9a667..dec9e19a 100644 --- a/ci/Jenkinsfile.hermes-voice-image +++ b/ci/Jenkinsfile.hermes-voice-image @@ -25,15 +25,8 @@ spec: nodeSelectorTerms: - matchExpressions: - key: kubernetes.io/hostname - operator: NotIn - values: [titan-04, titan-12, titan-14, titan-18, titan-19, titan-22, titan-24] - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - preference: - matchExpressions: - - key: hardware operator: In - values: [rpi5] + values: [titan-15, titan-17] imagePullSecrets: - name: harbor-bstein-robot containers: diff --git a/ci/Jenkinsfile.hermes-webui-image b/ci/Jenkinsfile.hermes-webui-image index 3c05f363..18932c36 100644 --- a/ci/Jenkinsfile.hermes-webui-image +++ b/ci/Jenkinsfile.hermes-webui-image @@ -25,23 +25,10 @@ spec: nodeSelectorTerms: - matchExpressions: - key: kubernetes.io/hostname - operator: NotIn - values: - - titan-04 - - titan-12 - - titan-14 - - titan-18 - - titan-19 - - titan-22 - - titan-24 - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - preference: - matchExpressions: - - key: hardware operator: In values: - - rpi5 + - titan-15 + - titan-17 imagePullSecrets: - name: harbor-bstein-robot containers: diff --git a/testing/tests/test_hermes_voice_release.py b/testing/tests/test_hermes_voice_release.py index 85457be5..5843cc62 100644 --- a/testing/tests/test_hermes_voice_release.py +++ b/testing/tests/test_hermes_voice_release.py @@ -21,7 +21,7 @@ def test_voice_pipeline_binds_component_source_digest_and_release() -> None: assert "PUBLISH HERMES TTS" in pipeline assert "archiveArtifacts(" in pipeline assert '"SETFCAP"' in pipeline - assert "titan-12" in pipeline + assert "values: [titan-15, titan-17]" in pipeline assert "ephemeral-storage: 10Gi" in pipeline assert "ephemeral-storage: 20Gi" in pipeline assert "privileged: true" not in pipeline diff --git a/testing/tests/test_hermes_webui_release.py b/testing/tests/test_hermes_webui_release.py index bd45ed61..6b8f9f2b 100644 --- a/testing/tests/test_hermes_webui_release.py +++ b/testing/tests/test_hermes_webui_release.py @@ -122,10 +122,10 @@ def test_pipeline_builds_latest_main_containing_reviewed_anchor() -> None: assert "kaniko" in containers assert containers["kaniko"]["resources"]["requests"]["ephemeral-storage"] == "10Gi" assert containers["kaniko"]["resources"]["limits"]["ephemeral-storage"] == "20Gi" - excluded_nodes = spec["affinity"]["nodeAffinity"][ + build_nodes = spec["affinity"]["nodeAffinity"][ "requiredDuringSchedulingIgnoredDuringExecution" ]["nodeSelectorTerms"][0]["matchExpressions"][0]["values"] - assert "titan-12" in excluded_nodes + assert build_nodes == ["titan-15", "titan-17"] assert "docker.sock" not in source and "hostPath" not in source for container in containers.values(): assert container["securityContext"]["allowPrivilegeEscalation"] is False