55 push :
66 pull_request_target :
77 types : [opened, synchronize, reopened, labeled]
8+ branches :
9+ - main
10+ - release/0.6
11+ - release/0.7
812
913jobs :
1014 # Own job so repository secrets are never sent to a runner unless this passes.
2024 matrix :
2125 mode : ["server", "library"]
2226 environment : ["ci"]
27+ is_release_06 :
28+ - ${{ github.base_ref == 'release/0.6' }}
2329 # Config-aligned shards (@cfg_*). Packed small groups keep job count reasonable
2430 # while avoiding mixed-config restarts inside large suites.
2531 shard :
@@ -36,25 +42,76 @@ jobs:
3642 - name : shields
3743 tags : " not @skip and @cfg_shields"
3844 - name : other
39- tags : " not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified)"
45+ tags : " not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified or @cfg_compaction )"
4046 # Server-only; listed in shard (not matrix.include) so it expands with
4147 # mode=server before any library jobs. include would append after library.
4248 - name : tls
4349 tags : " not @skip and @cfg_tls"
50+ - name : group 1
51+ tags : " not @skip and @e2e_group_1"
52+ - name : group 2
53+ tags : " not @skip and @e2e_group_2"
54+ - name : group 3
55+ tags : " not @skip and @e2e_group_3"
4456 exclude :
4557 - mode : library
4658 shard :
4759 name : tls
4860 tags : " not @skip and @cfg_tls"
61+ - is_release_06 : true
62+ shard :
63+ name : default
64+ tags : " not @skip and @cfg_default"
65+ - is_release_06 : true
66+ shard :
67+ name : authorized
68+ tags : " not @skip and @cfg_authorized"
69+ - is_release_06 : true
70+ shard :
71+ name : mcp
72+ tags : " not @skip and (@cfg_mcp or @cfg_mcp_invalid or @cfg_mcp_api_auth)"
73+ - is_release_06 : true
74+ shard :
75+ name : rbac
76+ tags : " not @skip and @cfg_rbac"
77+ - is_release_06 : true
78+ shard :
79+ name : skills
80+ tags : " not @skip and (@cfg_skills or @cfg_skills_directory)"
81+ - is_release_06 : true
82+ shard :
83+ name : shields
84+ tags : " not @skip and @cfg_shields"
85+ - is_release_06 : true
86+ shard :
87+ name : other
88+ tags : " not @skip and (@cfg_rh_identity or @cfg_negative or @cfg_byok_pdf or @cfg_degraded or @cfg_unified)"
89+ - is_release_06 : true
90+ shard :
91+ name : tls
92+ tags : " not @skip and @cfg_tls"
93+ - is_release_06 : false
94+ shard :
95+ name : group 1
96+ tags : " not @skip and @e2e_group_1"
97+ - is_release_06 : false
98+ shard :
99+ name : group 2
100+ tags : " not @skip and @e2e_group_2"
101+ - is_release_06 : false
102+ shard :
103+ name : group 3
104+ tags : " not @skip and @e2e_group_3"
49105
50106 name : " E2E: ${{ matrix.mode }} / ${{ matrix.environment }} / ${{ matrix.shard.name }}"
51-
107+
52108 env :
53109 OPENAI_API_KEY : ${{ secrets.OPENAI_API_KEY }}
54110 E2E_OPENAI_MODEL : ${{ vars.E2E_OPENAI_MODEL }}
55111 E2E_DEPLOYMENT_MODE : ${{ matrix.mode }}
56112 FAISS_VECTOR_STORE_ID : ${{ vars.FAISS_VECTOR_STORE_ID }}
57113 E2E_OGX_HOSTNAME : ogx
114+ E2E_LLAMA_HOSTNAME : ${{ vars.E2E_LLAMA_HOSTNAME || 'llama-stack' }}
58115
59116 steps :
60117 - uses : actions/checkout@v7
@@ -153,7 +210,7 @@ jobs:
153210 echo "Models: $(grep -c "model_id:" run.yaml)"
154211 echo ""
155212 echo "=== lightspeed-stack.yaml ==="
156- grep -A 3 " ogx:" lightspeed-stack.yaml
213+ grep -A 3 -E '^( ogx|llama_stack):' lightspeed-stack.yaml
157214
158215 - name : Cache HuggingFace embedding model
159216 uses : actions/cache@v4
@@ -288,8 +345,9 @@ jobs:
288345 echo "=== Test failure logs ==="
289346
290347 if [ "${{ matrix.mode }}" == "server" ]; then
291- echo "=== OGX logs ==="
292- docker compose logs ogx
348+ SERVICE=$(docker compose config --services | grep -E '^(ogx|llama-stack)$' | head -1)
349+ echo "=== ${SERVICE} logs ==="
350+ docker compose logs "$SERVICE"
293351 echo ""
294352 echo "=== lightspeed-stack logs ==="
295353 docker compose logs lightspeed-stack
0 commit comments