Skip to content

Commit 5bd0f08

Browse files
detschdetsch
authored
Merge pull request #465 from foundriesio/detsch-ci-jobs-split
ci: Split longer jobs in 2 jobs each
2 parents 8611b76 + 42f86a9 commit 5bd0f08

1 file changed

Lines changed: 90 additions & 6 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 90 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ jobs:
192192
USER_TOKEN: ${{ secrets.E2E_TEST_USER_TOKEN }}
193193
TAG: ${{secrets.E2E_TEST_TAG}}
194194

195-
e2e-test-basic-online-granular-steps:
196-
name: Basic online, granular steps end-to-end tests
195+
e2e-test-basic-online-granular-steps-no-delay-apps:
196+
name: Basic online, granular steps, no delay start apps end-to-end tests
197197
runs-on: ubuntu-latest
198198
needs: refresh-ccache-e2e
199199

@@ -226,14 +226,56 @@ jobs:
226226
- run: ./dev-shell-e2e-test.sh make -f dev-flow.mk config build
227227
env:
228228
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
229-
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[False-False or test_update_to_latest[False-False'
229+
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[False-False-False or test_update_to_latest[False-False'
230230
env:
231231
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
232232
FACTORY: ${{ secrets.E2E_TEST_FACTORY }}
233233
BASE_TARGET_VERSION: ${{ secrets.E2E_TEST_BASE_TARGET_VERSION }}
234234
USER_TOKEN: ${{ secrets.E2E_TEST_USER_TOKEN }}
235235
TAG: ${{secrets.E2E_TEST_TAG}}
236236

237+
e2e-test-basic-online-granular-steps-delay-apps:
238+
name: Basic online, granular steps, delay start apps end-to-end tests
239+
runs-on: ubuntu-latest
240+
needs: refresh-ccache-e2e
241+
242+
steps:
243+
- uses: actions/checkout@v4
244+
- run: git config --global --add safe.directory ${{ github.workspace }}
245+
- run: git submodule update --init --recursive
246+
- name: Restore ccache
247+
uses: actions/cache@v4
248+
with:
249+
path: ${{ github.workspace }}/.ccache
250+
key: e2e-ccache-${{ github.sha }}
251+
restore-keys: |
252+
e2e-ccache-
253+
254+
- name: Log in to GitHub Container Registry
255+
uses: docker/login-action@v3
256+
with:
257+
registry: ghcr.io
258+
username: ${{ github.actor }}
259+
password: ${{ secrets.GITHUB_TOKEN }}
260+
- name: Check if image exists # Fallback to master image if branch-specific image doesn't exist
261+
id: check_image
262+
run: |
263+
if docker manifest inspect ghcr.io/${{ github.repository }}/aklite-e2e-test:${{ github.ref_name }} > /dev/null 2>&1; then
264+
echo "AKLITE_E2E_IMAGE=ghcr.io/${{ github.repository }}/aklite-e2e-test:${{ github.ref_name }}" >> $GITHUB_ENV
265+
else
266+
echo "AKLITE_E2E_IMAGE=ghcr.io/${{ github.repository }}/aklite-e2e-test:master" >> $GITHUB_ENV
267+
fi
268+
- run: ./dev-shell-e2e-test.sh make -f dev-flow.mk config build
269+
env:
270+
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
271+
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[False-False-True'
272+
env:
273+
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
274+
FACTORY: ${{ secrets.E2E_TEST_FACTORY }}
275+
BASE_TARGET_VERSION: ${{ secrets.E2E_TEST_BASE_TARGET_VERSION }}
276+
USER_TOKEN: ${{ secrets.E2E_TEST_USER_TOKEN }}
277+
TAG: ${{secrets.E2E_TEST_TAG}}
278+
237279
e2e-test-basic-offline-single-step:
238280
name: Basic offline, single step end-to-end tests
239281
runs-on: ubuntu-latest
@@ -276,8 +318,8 @@ jobs:
276318
TAG: ${{secrets.E2E_TEST_TAG}}
277319
E2E_TEST_OSTREE_TGZ: ${{ secrets.E2E_TEST_OSTREE_TGZ }}
278320

279-
e2e-test-basic-offline-granular-steps:
280-
name: Basic offline, granular steps end-to-end tests
321+
e2e-test-basic-offline-granular-steps-no-delay-apps:
322+
name: Basic offline, granular steps, no delay start apps end-to-end tests
281323
runs-on: ubuntu-latest
282324
needs: refresh-ccache-e2e
283325

@@ -309,7 +351,7 @@ jobs:
309351
- run: ./dev-shell-e2e-test.sh make -f dev-flow.mk config build
310352
env:
311353
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
312-
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[True-False or test_update_to_latest[True-False'
354+
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[True-False-False or test_update_to_latest[True-False'
313355
env:
314356
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
315357
FACTORY: ${{ secrets.E2E_TEST_FACTORY }}
@@ -318,6 +360,48 @@ jobs:
318360
TAG: ${{secrets.E2E_TEST_TAG}}
319361
E2E_TEST_OSTREE_TGZ: ${{ secrets.E2E_TEST_OSTREE_TGZ }}
320362

363+
e2e-test-basic-offline-granular-steps-delay-apps:
364+
name: Basic offline, granular steps, delay start apps end-to-end tests
365+
runs-on: ubuntu-latest
366+
needs: refresh-ccache-e2e
367+
368+
steps:
369+
- uses: actions/checkout@v4
370+
- run: git config --global --add safe.directory ${{ github.workspace }}
371+
- run: git submodule update --init --recursive
372+
- name: Restore ccache
373+
uses: actions/cache@v4
374+
with:
375+
path: ${{ github.workspace }}/.ccache
376+
key: e2e-ccache-${{ github.sha }}
377+
restore-keys: |
378+
e2e-ccache-
379+
- name: Log in to GitHub Container Registry
380+
uses: docker/login-action@v3
381+
with:
382+
registry: ghcr.io
383+
username: ${{ github.actor }}
384+
password: ${{ secrets.GITHUB_TOKEN }}
385+
- name: Check if image exists # Fallback to master image if branch-specific image doesn't exist
386+
id: check_image
387+
run: |
388+
if docker manifest inspect ghcr.io/${{ github.repository }}/aklite-e2e-test:${{ github.ref_name }} > /dev/null 2>&1; then
389+
echo "AKLITE_E2E_IMAGE=ghcr.io/${{ github.repository }}/aklite-e2e-test:${{ github.ref_name }}" >> $GITHUB_ENV
390+
else
391+
echo "AKLITE_E2E_IMAGE=ghcr.io/${{ github.repository }}/aklite-e2e-test:master" >> $GITHUB_ENV
392+
fi
393+
- run: ./dev-shell-e2e-test.sh make -f dev-flow.mk config build
394+
env:
395+
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
396+
- run: ./dev-shell-e2e-test.sh pytest docker-e2e-test/e2e-test.py -k 'test_incremental_updates[True-False-True'
397+
env:
398+
AKLITE_E2E_IMAGE: ${{ env.AKLITE_E2E_IMAGE }}
399+
FACTORY: ${{ secrets.E2E_TEST_FACTORY }}
400+
BASE_TARGET_VERSION: ${{ secrets.E2E_TEST_BASE_TARGET_VERSION }}
401+
USER_TOKEN: ${{ secrets.E2E_TEST_USER_TOKEN }}
402+
TAG: ${{secrets.E2E_TEST_TAG}}
403+
E2E_TEST_OSTREE_TGZ: ${{ secrets.E2E_TEST_OSTREE_TGZ }}
404+
321405
e2e-test-1:
322406
name: End-to-end tests additional set
323407
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)