Skip to content

Commit 7dfaaab

Browse files
sandereggsanderegg
committed
more cleanup
1 parent 9903cb1 commit 7dfaaab

File tree

1 file changed

+50
-144
lines changed

1 file changed

+50
-144
lines changed

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 50 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,37 +1932,18 @@ jobs:
19321932
fail-fast: false
19331933
steps:
19341934
- uses: actions/checkout@v4
1935-
- name: setup docker buildx
1936-
id: buildx
1937-
uses: docker/setup-buildx-action@v3
1938-
with:
1939-
driver: docker-container
1940-
- name: setup python environment
1941-
uses: actions/setup-python@v5
1935+
- name: Setup SimCore environment
1936+
uses: ./.github/actions/setup-simcore-env
19421937
with:
19431938
python-version: ${{ matrix.python }}
1944-
- name: expose github runtime for buildx
1945-
uses: crazy-max/ghaction-github-runtime@v3
1946-
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
1947-
- name: download docker images with retry
1948-
uses: Wandalen/wretry.action@master
1949-
with:
1950-
action: actions/download-artifact@v4
1951-
with: |
1952-
pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
1953-
path: /${{ runner.temp }}/build
1954-
attempt_limit: 5
1955-
attempt_delay: 1000
1956-
- name: install uv
1957-
uses: astral-sh/setup-uv@v6
1958-
with:
1959-
version: "0.6.x"
1960-
enable-cache: false
19611939
cache-dependency-glob: "**/public-api/requirements/ci.txt"
1962-
- name: load docker images
1963-
run: make load-images local-src=/${{ runner.temp }}/build
1964-
- name: show system version
1965-
run: ./ci/helpers/show_system_versions.bash
1940+
setup-docker: 'true'
1941+
show-system-versions: 'true'
1942+
expose-github-runtime: 'true'
1943+
- name: Download and load Docker images
1944+
uses: ./.github/actions/download-load-docker-images
1945+
with:
1946+
artifact-name-pattern: '*'
19661947
- name: install
19671948
env:
19681949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1992,37 +1973,18 @@ jobs:
19921973
fail-fast: false
19931974
steps:
19941975
- uses: actions/checkout@v4
1995-
- name: setup docker buildx
1996-
id: buildx
1997-
uses: docker/setup-buildx-action@v3
1998-
with:
1999-
driver: docker-container
2000-
- name: setup python environment
2001-
uses: actions/setup-python@v5
1976+
- name: Setup SimCore environment
1977+
uses: ./.github/actions/setup-simcore-env
20021978
with:
20031979
python-version: ${{ matrix.python }}
2004-
- name: expose github runtime for buildx
2005-
uses: crazy-max/ghaction-github-runtime@v3
2006-
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
2007-
- name: download docker images with retry
2008-
uses: Wandalen/wretry.action@master
2009-
with:
2010-
action: actions/download-artifact@v4
2011-
with: |
2012-
pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
2013-
path: /${{ runner.temp }}/build
2014-
attempt_limit: 5
2015-
attempt_delay: 1000
2016-
- name: install uv
2017-
uses: astral-sh/setup-uv@v6
2018-
with:
2019-
version: "0.6.x"
2020-
enable-cache: false
20211980
cache-dependency-glob: "**/swarm-deploy/requirements/ci.txt"
2022-
- name: load docker images
2023-
run: make load-images local-src=/${{ runner.temp }}/build
2024-
- name: show system version
2025-
run: ./ci/helpers/show_system_versions.bash
1981+
setup-docker: 'true'
1982+
show-system-versions: 'true'
1983+
expose-github-runtime: 'true'
1984+
- name: Download and load Docker images
1985+
uses: ./.github/actions/download-load-docker-images
1986+
with:
1987+
artifact-name-pattern: '*'
20261988
- name: install
20271989
run: ./ci/github/system-testing/swarm-deploy.bash install
20281990
- name: test
@@ -2058,42 +2020,23 @@ jobs:
20582020
fail-fast: false
20592021
steps:
20602022
- uses: actions/checkout@v4
2061-
- name: setup docker buildx
2062-
id: buildx
2063-
uses: docker/setup-buildx-action@v3
2064-
with:
2065-
driver: docker-container
2066-
- name: setup python environment
2067-
uses: actions/setup-python@v5
2023+
- name: Setup SimCore environment
2024+
uses: ./.github/actions/setup-simcore-env
20682025
with:
20692026
python-version: ${{ matrix.python }}
2027+
cache-dependency-glob: "**/e2e/requirements/requirements.txt"
2028+
setup-docker: 'true'
2029+
show-system-versions: 'true'
2030+
expose-github-runtime: 'true'
20702031
- uses: actions/[email protected]
20712032
with:
20722033
node-version: ${{ matrix.node }}
20732034
cache: "npm"
20742035
cache-dependency-path: "tests/e2e/package-lock.json"
2075-
- name: expose github runtime for buildx
2076-
uses: crazy-max/ghaction-github-runtime@v3
2077-
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
2078-
- name: download docker images with retry
2079-
uses: Wandalen/wretry.action@master
2080-
with:
2081-
action: actions/download-artifact@v4
2082-
with: |
2083-
pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
2084-
path: /${{ runner.temp }}/build
2085-
attempt_limit: 5
2086-
attempt_delay: 1000
2087-
- name: install uv
2088-
uses: astral-sh/setup-uv@v6
2089-
with:
2090-
version: "0.6.x"
2091-
enable-cache: false
2092-
cache-dependency-glob: "**/e2e/requirements/requirements.txt"
2093-
- name: load docker images
2094-
run: make load-images local-src=/${{ runner.temp }}/build
2095-
- name: show system version
2096-
run: ./ci/helpers/show_system_versions.bash
2036+
- name: Download and load Docker images
2037+
uses: ./.github/actions/download-load-docker-images
2038+
with:
2039+
artifact-name-pattern: '*'
20972040
- name: setup
20982041
run: ./ci/github/system-testing/e2e.bash install
20992042
- name: test
@@ -2140,34 +2083,20 @@ jobs:
21402083
fail-fast: false
21412084
steps:
21422085
- uses: actions/checkout@v4
2143-
- name: setup docker buildx
2144-
id: buildx
2145-
uses: docker/setup-buildx-action@v3
2146-
with:
2147-
driver: docker-container
2148-
- name: setup python environment
2149-
uses: actions/setup-python@v5
2086+
- name: Setup SimCore environment
2087+
uses: ./.github/actions/setup-simcore-env
21502088
with:
21512089
python-version: ${{ matrix.python }}
2152-
- name: install uv
2153-
uses: astral-sh/setup-uv@v6
2154-
with:
2155-
version: "0.6.x"
2156-
enable-cache: false
21572090
cache-dependency-glob: "**/e2e-playwright/requirements/ci.txt"
2158-
- name: expose github runtime for buildx
2159-
uses: crazy-max/ghaction-github-runtime@v3
2160-
- name: download docker images
2161-
uses: actions/download-artifact@v4
2162-
with:
2163-
pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
2164-
path: /${{ runner.temp }}/build
2165-
- name: load docker images
2166-
run: make load-images local-src=/${{ runner.temp }}/build
2091+
setup-docker: 'true'
2092+
show-system-versions: 'true'
2093+
expose-github-runtime: 'true'
2094+
- name: Download and load Docker images
2095+
uses: ./.github/actions/download-load-docker-images
2096+
with:
2097+
artifact-name-pattern: '*'
21672098
- name: prepare devenv
21682099
run: make devenv
2169-
- name: show system version
2170-
run: ./ci/helpers/show_system_versions.bash
21712100
- name: setup
21722101
run: |
21732102
./ci/github/system-testing/e2e-playwright.bash install
@@ -2202,23 +2131,13 @@ jobs:
22022131
fail-fast: false
22032132
steps:
22042133
- uses: actions/checkout@v4
2205-
- name: setup docker buildx
2206-
id: buildx
2207-
uses: docker/setup-buildx-action@v3
2208-
with:
2209-
driver: docker-container
2210-
- name: setup python environment
2211-
uses: actions/setup-python@v5
2134+
- name: Setup SimCore environment
2135+
uses: ./.github/actions/setup-simcore-env
22122136
with:
22132137
python-version: ${{ matrix.python }}
2214-
- name: install uv
2215-
uses: astral-sh/setup-uv@v6
2216-
with:
2217-
version: "0.6.x"
2218-
enable-cache: false
22192138
cache-dependency-glob: "**/environment-setup/requirements/ci.txt"
2220-
- name: show system version
2221-
run: ./ci/helpers/show_system_versions.bash
2139+
setup-docker: 'true'
2140+
show-system-versions: 'true'
22222141
- name: install
22232142
run: ./ci/github/system-testing/environment-setup.bash install
22242143
- name: test
@@ -2266,30 +2185,17 @@ jobs:
22662185
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
22672186
steps:
22682187
- uses: actions/checkout@v4
2269-
- name: setup docker buildx
2270-
id: buildx
2271-
uses: docker/setup-buildx-action@v3
2272-
with:
2273-
driver: docker-container
2274-
- name: install uv
2275-
uses: astral-sh/setup-uv@v6
2188+
- name: Setup SimCore environment
2189+
uses: ./.github/actions/setup-simcore-env
22762190
with:
2277-
version: "0.6.x"
2278-
enable-cache: false
2191+
python-version: ${{ matrix.python }}
22792192
cache-dependency-glob: "**/e2e-playwright/requirements/ci.txt"
2280-
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249
2281-
- name: download docker images with retry
2282-
uses: Wandalen/wretry.action@master
2283-
with:
2284-
action: actions/download-artifact@v4
2285-
with: |
2286-
pattern: docker-buildx-images-${{ runner.os }}-${{ github.sha }}-*
2287-
path: /${{ runner.temp }}/build
2288-
attempt_limit: 5
2289-
attempt_delay: 1000
2290-
- name: load docker images
2291-
run: |
2292-
make load-images local-src=/${{ runner.temp }}/build
2193+
setup-docker: 'true'
2194+
show-system-versions: false
2195+
- name: Download and load Docker images
2196+
uses: ./.github/actions/download-load-docker-images
2197+
with:
2198+
artifact-name-pattern: '*'
22932199
- name: set owner variable
22942200
run: echo "OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
22952201
- if: github.ref == 'refs/heads/master'

0 commit comments

Comments
 (0)