Skip to content

Commit ffde712

Browse files
RobPasMueRobPasMue
committed
ci: remove DMS from pipelines and use core service images only
1 parent 0ba96b3 commit ffde712

File tree

3 files changed

+14
-201
lines changed

3 files changed

+14
-201
lines changed

‎.github/workflows/ci_cd.yml‎

Lines changed: 9 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
PACKAGE_NAME: 'ansys-geometry-core'
1414
DOCUMENTATION_CNAME: 'geometry.docs.pyansys.com'
1515
ANSRV_GEO_IMAGE: 'ghcr.io/ansys/geometry'
16-
ANSRV_GEO_IMAGE_DOCS_TAG: ghcr.io/ansys/geometry:windows-latest
16+
ANSRV_GEO_IMAGE_DOCS_TAG: ghcr.io/ansys/geometry:core-windows-latest
1717
ANSRV_GEO_PORT: 700
1818
ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
1919
GEO_CONT_NAME: ans_geo
@@ -108,16 +108,11 @@ jobs:
108108
name: Check Docker manifests
109109
runs-on: ubuntu-latest
110110
outputs:
111-
skip_dms: ${{ steps.services.outputs.skip_dms }}
112111
skip_core_windows: ${{ steps.services.outputs.skip_core_windows }}
113112
skip_core_linux: ${{ steps.services.outputs.skip_core_linux }}
114113
strategy:
115114
matrix:
116115
include:
117-
- container-stable: "windows-latest"
118-
container-unstable: "windows-latest-unstable"
119-
service: "dms"
120-
service-name: "Windows DMS"
121116
- container-stable: "core-windows-latest"
122117
container-unstable: "core-windows-latest-unstable"
123118
service: "core_windows"
@@ -171,10 +166,6 @@ jobs:
171166
fail-fast: false
172167
matrix:
173168
include:
174-
- docker-image: "windows-latest"
175-
experimental: false
176-
- docker-image: "windows-latest-unstable"
177-
experimental: true
178169
- docker-image: "core-windows-latest"
179170
experimental: false
180171
- docker-image: "core-windows-latest-unstable"
@@ -184,11 +175,8 @@ jobs:
184175
- name: Calculate SKIP_UNSTABLE
185176
if: matrix.experimental
186177
run: |
187-
# Choose the manifests output to consider (for DMS or Core service)
188-
# based on the matrix value
189-
if ("${{ matrix.docker-image }}" -eq "windows-latest-unstable") {
190-
$ImagesAreEqual = ${{ needs.manifests.outputs.skip_dms }}
191-
} elseif ("${{ matrix.docker-image }}" -eq "core-windows-latest-unstable") {
178+
# Choose the manifests output to consider based on the matrix value
179+
if ("${{ matrix.docker-image }}" -eq "core-windows-latest-unstable") {
192180
$ImagesAreEqual = ${{ needs.manifests.outputs.skip_core_windows }}
193181
} else {
194182
Write-Output "Unknown docker image"
@@ -307,7 +295,7 @@ jobs:
307295

308296
- name: Upload coverage to Codecov
309297
uses: codecov/codecov-action@v5
310-
if: matrix.docker-image == 'windows-latest'
298+
if: matrix.docker-image == 'core-windows-latest'
311299
env:
312300
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
313301
with:
@@ -335,14 +323,12 @@ jobs:
335323
docs:
336324
name: Documentation
337325
needs: [docs-style]
338-
runs-on: [self-hosted, Windows, pygeometry]
326+
runs-on: ubuntu-latest
339327
env:
340328
PYVISTA_OFF_SCREEN: true
341329
steps:
342330
- name: Set up headless display
343331
uses: pyvista/setup-headless-display-action@v3
344-
with:
345-
pyvista: false
346332

347333
- name: Login to GitHub Container Registry
348334
uses: docker/login-action@v3
@@ -351,24 +337,10 @@ jobs:
351337
username: ${{ github.actor }}
352338
password: ${{ secrets.GITHUB_TOKEN }}
353339

354-
- name: Download Geometry service container (if needed)
355-
run: docker pull ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
356-
357-
- name: Check location of self-hosted runner and define license server accordingly
358-
if: runner.name == 'pygeometry-ci-2'
359-
run:
360-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
361-
362-
- name: Stop any running containers
340+
- name: Pull and launch geometry service
363341
run: |
364-
$dockerContainers = docker ps -a -q
365-
if (-not [string]::IsNullOrEmpty($dockerContainers)) {
366-
docker stop $dockerContainers
367-
docker rm $dockerContainers
368-
}
369-
370-
- name: Start Geometry service and verify start
371-
run: docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
342+
docker pull ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
343+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
372344
373345
- name: Run Ansys documentation building action
374346
uses: ansys/actions/doc-build@v8
@@ -384,15 +356,6 @@ jobs:
384356
docker logs ${{ env.GEO_CONT_NAME }}
385357
docker rm ${{ env.GEO_CONT_NAME }}
386358
387-
- name: Stop any remaining containers
388-
if: always()
389-
run: |
390-
$dockerContainers = docker ps -a -q
391-
if (-not [string]::IsNullOrEmpty($dockerContainers)) {
392-
docker stop $dockerContainers
393-
docker rm $dockerContainers
394-
}
395-
396359
397360
# =================================================================================================
398361
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -633,7 +596,6 @@ jobs:
633596
- name: Download binaries (if conditions met)
634597
if: env.REUSE_LAST_ARTIFACTS == 'false'
635598
run: |
636-
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerWindows.zip --output windows-dms-binaries.zip
637599
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerCoreWindows.zip --output windows-core-binaries.zip
638600
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerCoreLinux.zip --output linux-core-binaries.zip
639601
@@ -654,17 +616,9 @@ jobs:
654616
git lfs fetch origin --include="$env:PREVIOUS_VERSION/*"
655617
git lfs checkout $env:PREVIOUS_VERSION
656618
# Copy the binaries from the previous version
657-
cp ./$env:PREVIOUS_VERSION/windows-dms-binaries.zip windows-dms-binaries.zip
658619
cp ./$env:PREVIOUS_VERSION/windows-core-binaries.zip windows-core-binaries.zip
659620
cp ./$env:PREVIOUS_VERSION/linux-core-binaries.zip linux-core-binaries.zip
660621
661-
- name: Upload DMS Windows binaries as workflow artifacts
662-
uses: actions/upload-artifact@v4
663-
with:
664-
name: windows-dms-binaries.zip
665-
path: windows-dms-binaries.zip
666-
retention-days: 1
667-
668622
- name: Upload Linux Core service binaries as workflow artifacts
669623
uses: actions/upload-artifact@v4
670624
with:
@@ -686,7 +640,6 @@ jobs:
686640
$env:VERSION=$env:VERSION_WITH_PREFIX.substring(1)
687641
mkdir $env:VERSION -ErrorAction SilentlyContinue
688642
Remove-Item -Recurse -Force .\$env:VERSION\*
689-
mv windows-dms-binaries.zip .\$env:VERSION\
690643
mv windows-core-binaries.zip .\$env:VERSION\
691644
mv linux-core-binaries.zip .\$env:VERSION\
692645
git config user.email ${{ secrets.BINARIES_EMAIL }}
@@ -703,9 +656,6 @@ jobs:
703656
fail-fast: false
704657
matrix:
705658
include:
706-
- mode: "dms"
707-
docker-file: "windows-dms-dockerfile.zip"
708-
zip-file: "windows-dms-binaries.zip"
709659
- mode: "coreservice"
710660
docker-file: "windows-core-dockerfile.zip"
711661
zip-file: "windows-core-binaries.zip"
@@ -890,7 +840,7 @@ jobs:
890840
with:
891841
token: ${{ secrets.GITHUB_TOKEN }}
892842
library-name: ${{ env.PACKAGE_NAME }}
893-
additional-artifacts: windows-dms-dockerfile.zip windows-core-dockerfile.zip linux-core-dockerfile.zip
843+
additional-artifacts: windows-core-dockerfile.zip linux-core-dockerfile.zip
894844

895845
upload_dev_docs:
896846
name: Upload dev documentation

‎.github/workflows/docker_ansyslab_windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ permissions:
1212
packages: read
1313

1414
env:
15-
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
16-
WINDOWS_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:windows-latest
15+
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:core-windows-latest
16+
WINDOWS_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:core-windows-latest
1717

1818
jobs:
1919
windows-ansyslab:

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 3 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ on:
2222

2323
env:
2424
MAIN_PYTHON_VERSION: '3.12'
25-
ANSRV_GEO_IMAGE_WINDOWS_TAG: ghcr.io/ansys/geometry:windows-latest-unstable
2625
ANSRV_GEO_IMAGE_WINDOWS_CORE_TAG: ghcr.io/ansys/geometry:core-windows-latest-unstable
2726
ANSRV_GEO_IMAGE_LINUX_CORE_TAG: ghcr.io/ansys/geometry:core-linux-latest-unstable
2827
ANSRV_GEO_PORT: 710
@@ -39,16 +38,11 @@ jobs:
3938
name: Check Docker manifests
4039
runs-on: ubuntu-latest
4140
outputs:
42-
skip_dms: ${{ steps.services.outputs.skip_dms }}
4341
skip_core_windows: ${{ steps.services.outputs.skip_core_windows }}
4442
skip_core_linux: ${{ steps.services.outputs.skip_core_linux }}
4543
strategy:
4644
matrix:
4745
include:
48-
- container-stable: "windows-latest"
49-
container-unstable: "windows-latest-unstable"
50-
service: "dms"
51-
service-name: "Windows DMS"
5246
- container-stable: "core-windows-latest"
5347
container-unstable: "core-windows-latest-unstable"
5448
service: "core_windows"
@@ -90,113 +84,7 @@ jobs:
9084
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9185
# =================================================================================================
9286

93-
windows-dms-tests:
94-
name: Windows DMS
95-
needs: manifests
96-
if: needs.manifests.outputs.skip_dms == 0
97-
runs-on: [self-hosted, Windows, pygeometry]
98-
env:
99-
PYVISTA_OFF_SCREEN: true
100-
steps:
101-
- uses: actions/checkout@v4
102-
103-
- name: Set up Python
104-
uses: actions/setup-python@v5
105-
with:
106-
python-version: ${{ env.MAIN_PYTHON_VERSION }}
107-
108-
- name: Set up headless display
109-
uses: pyvista/setup-headless-display-action@v3
110-
with:
111-
pyvista: false
112-
113-
- name: Create Python venv
114-
run: |
115-
python -m venv .venv
116-
.\.venv\Scripts\Activate.ps1
117-
118-
- name: Install packages for testing
119-
run: |
120-
.\.venv\Scripts\Activate.ps1
121-
pip install --upgrade build
122-
pip install .[tests]
123-
124-
- name: Login to GitHub Container Registry
125-
uses: docker/login-action@v3
126-
with:
127-
registry: ghcr.io
128-
username: ${{ github.actor }}
129-
password: ${{ secrets.GITHUB_TOKEN }}
130-
131-
- name: Download Geometry service container (always latest version)
132-
run: |
133-
docker image rm ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }}
134-
docker pull ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }}
135-
136-
- name: Check location of self-hosted runner and define license server accordingly
137-
if: runner.name == 'pygeometry-ci-2'
138-
run:
139-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
140-
141-
- name: Start Geometry service and verify start
142-
run: |
143-
.\.venv\Scripts\Activate.ps1
144-
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }}
145-
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
146-
147-
- name: Run PyAnsys Geometry tests
148-
run: |
149-
.\.venv\Scripts\Activate.ps1
150-
pytest -v
151-
152-
- name: Stop the Geometry service
153-
if: always()
154-
run: |
155-
docker stop ${{ env.GEO_CONT_NAME }}
156-
docker logs ${{ env.GEO_CONT_NAME }}
157-
docker rm ${{ env.GEO_CONT_NAME }}
158-
159-
- name: Stop any remaining containers
160-
if: always()
161-
run: |
162-
$dockerContainers = docker ps -a -q
163-
if (-not [string]::IsNullOrEmpty($dockerContainers)) {
164-
docker stop $dockerContainers
165-
docker rm $dockerContainers
166-
}
167-
168-
- name: Clean all Docker dangling images
169-
if: always()
170-
run: docker image prune -f
171-
172-
- name: Microsoft Teams Notification
173-
uses: skitionek/notify-microsoft-teams@master
174-
if: failure()
175-
with:
176-
webhook_url: ${{ secrets.MSTEAMS_WEBHOOK }}
177-
# Message to send to Teams as a webhook notification in JSON Payload format
178-
raw: >-
179-
{
180-
"@type": "MessageCard",
181-
"@context": "http://schema.org/extensions",
182-
"summary": "Unstable build tests for Windows DMS failing",
183-
"themeColor": "f44336",
184-
"title": "PyAnsys Geometry unstable build tests - Windows DMS failing",
185-
"sections": [
186-
{
187-
"activityTitle": "Windows DMS unstable build tests are failing",
188-
"activitySubtitle": "Check the run for more details: https://github.com/ansys/pyansys-geometry/actions/runs/${{ github.run_id }}",
189-
"facts": [
190-
{
191-
"name": "Status",
192-
"value": "Failed"
193-
}
194-
]
195-
}
196-
]
197-
}
198-
199-
windows-core-tests:
87+
windows-tests:
20088
name: Windows Core Service
20189
needs: manifests
20290
if: needs.manifests.outputs.skip_core_windows == 0
@@ -368,33 +256,8 @@ jobs:
368256
]
369257
}
370258
371-
promote-windows-dms:
372-
needs: windows-dms-tests
373-
runs-on: windows-latest
374-
name: Promote Windows DMS container
375-
if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
376-
env:
377-
WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
378-
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
379-
steps:
380-
- name: Login in Github Container registry
381-
uses: docker/login-action@v3
382-
with:
383-
registry: ghcr.io
384-
username: ${{ github.actor }}
385-
password: ${{ secrets.GITHUB_TOKEN }}
386-
387-
- name: Pull Windows latest unstable container
388-
run: docker pull ${{ env.WINDOWS_UNSTABLE }}
389-
390-
- name: Tag container as latest (stable) for Github Container registry
391-
run: docker tag ${{ env.WINDOWS_UNSTABLE }} ${{ env.WINDOWS_STABLE_GHCR }}
392-
393-
- name: Publish latest stable container in ghcr.io
394-
run: docker push ${{ env.WINDOWS_STABLE_GHCR }}
395-
396-
promote-windows-core:
397-
needs: windows-core-tests
259+
promote-windows:
260+
needs: windows-tests
398261
runs-on: windows-latest
399262
name: Promote Windows Core Service container
400263
if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}

0 commit comments

Comments
 (0)