Skip to content

Commit b543815

Browse files
author
Kowser
committed
ci(agent-e2e): align env var naming + CLI pin with idea-13 DD10 ruling
CONDUCTOR_OSS_VERSION -> CONDUCTOR_SERVER_VERSION and AGENTSPAN_CLI_VERSION 0.4.3 -> 0.4.4, matching the already-agreed CI shape in idea-13/design.md (analysis workspace, not shipped here) rather than inventing new names.
1 parent d23edc6 commit b543815

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/agent-e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ concurrency:
2626
cancel-in-progress: true
2727

2828
env:
29-
CONDUCTOR_OSS_VERSION: "3.32.0-rc.8" # pinned server release — bump deliberately
30-
AGENTSPAN_CLI_VERSION: "0.4.3" # pinned CLI release — independent of the server
29+
CONDUCTOR_SERVER_VERSION: "3.32.0-rc.8" # pinned server release — bump deliberately
30+
AGENTSPAN_CLI_VERSION: "0.4.4" # pinned CLI release — independent of the server (revert to 0.4.3 if this breaks)
3131

3232
jobs:
3333
agent-e2e:
@@ -59,13 +59,13 @@ jobs:
5959
uses: actions/cache@v4
6060
with:
6161
path: conductor-server.jar
62-
key: conductor-oss-server-${{ env.CONDUCTOR_OSS_VERSION }}
62+
key: conductor-oss-server-${{ env.CONDUCTOR_SERVER_VERSION }}
6363

6464
- name: Download server JAR from Maven Central
6565
if: steps.jar_cache.outputs.cache-hit != 'true'
6666
run: |
6767
curl -fL --retry 3 -o conductor-server.jar \
68-
"https://repo1.maven.org/maven2/org/conductoross/conductor-server/${CONDUCTOR_OSS_VERSION}/conductor-server-${CONDUCTOR_OSS_VERSION}-boot.jar"
68+
"https://repo1.maven.org/maven2/org/conductoross/conductor-server/${CONDUCTOR_SERVER_VERSION}/conductor-server-${CONDUCTOR_SERVER_VERSION}-boot.jar"
6969
7070
- name: Download CLI binary from release
7171
env:

e2e/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def get_task_by_name(execution_id: str, task_ref_prefix: str) -> list:
163163
# when unsupported.
164164
#
165165
# conductor-oss implements this from 3.32.0-rc.8 onward (see
166-
# .github/workflows/agent-e2e.yml's CONDUCTOR_OSS_VERSION) — this guard lets the
166+
# .github/workflows/agent-e2e.yml's CONDUCTOR_SERVER_VERSION) — this guard lets the
167167
# credential tests run automatically against any server that has it, no test
168168
# change needed.
169169

@@ -209,6 +209,6 @@ def requires_runtime_metadata():
209209
pytest.skip(
210210
"server does not persist/deliver TaskDef.runtimeMetadata "
211211
"(conductor-oss PR #1255) — worker credential injection requires it. "
212-
"Needs conductor-oss >= 3.32.0-rc.8 (see CONDUCTOR_OSS_VERSION in "
212+
"Needs conductor-oss >= 3.32.0-rc.8 (see CONDUCTOR_SERVER_VERSION in "
213213
".github/workflows/agent-e2e.yml)."
214214
)

0 commit comments

Comments
 (0)