Merge branch 'main' into fix/args_in_standalone_launcher

Author: prmukherj

.ci/docker_data_cleaner.py

@@ -0,0 +1,51 @@
+"""
+Script to clean up all docker data except for specified images.
+Run this script before and after each job that starts the Fluent docker container.
+Must set the FLUENT_STABLE_IMAGE_DEV environment variable to the dev image sha256 value.
+"""
+
+import os
+import subprocess
+
+IMAGE_TAGS_TO_RETAIN = ["v24.2.5", "v25.1.4", "v25.2.3"]
+
+
+def clean_docker_data():
+    """Cleans up all docker data except for specified images.
+
+    Raises
+    ------
+    OSError
+        If FLUENT_STABLE_IMAGE_DEV environment variable is not set.
+    """
+    # Stop and remove all containers
+    container_ids = subprocess.check_output(["docker", "ps", "-aq"]).decode().split()
+    for container_id in container_ids:
+        subprocess.run(["docker", "rm", "-f", container_id], check=True)
+
+    # Remove all images except those in IMAGE_TAGS_TO_RETAIN and the dev image
+    images_to_retain = [f"ghcr.io/ansys/fluent:{tag}" for tag in IMAGE_TAGS_TO_RETAIN]
+    dev_image_sha = os.getenv("FLUENT_STABLE_IMAGE_DEV")
+    if not dev_image_sha:
+        raise OSError("FLUENT_STABLE_IMAGE_DEV environment variable is not set.")
+
+    images_output = subprocess.check_output(
+        [
+            "docker",
+            "images",
+            "--format",
+            "{{.Repository}}:{{.Tag}} {{.ID}}",
+            "--no-trunc",
+        ]
+    ).decode()
+    for line in images_output.splitlines():
+        image, image_id = line.strip().split()
+        if image not in images_to_retain and image_id != dev_image_sha:
+            subprocess.run(["docker", "rmi", "-f", image_id], check=True)
+
+    # Remove everything else (networks, volumes)
+    subprocess.run(["docker", "system", "prune", "-f", "--volumes"], check=True)
+
+
+if __name__ == "__main__":
+    clean_docker_data()

.ci/generate_certs.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+
+# Create certs directory
+mkdir -p certs
+pushd certs > /dev/null
+
+# Generate private key for CA
+openssl genrsa -out ca.key 4096
+
+# Generate self-signed CA certificate
+openssl req -x509 -new -nodes -key ca.key -sha256 -days 200 -out ca.crt \
+    -subj "/CN=MyRootCA"
+
+# Generate server private key
+openssl genrsa -out server.key 4096
+
+# Generate a certificate signing request (CSR) for the server
+openssl req -new -key server.key -out server.csr \
+    -subj "/CN=localhost"
+
+# Generate server certificate signed by the CA
+openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key -CAcreateserial \
+    -out server.crt -days 3650 -sha256 -extfile ../.ci/server_ext.cnf -extensions v3_req
+
+# Generate client private key
+openssl genrsa -out client.key 4096
+
+# Generate a certificate signing request (CSR) for the client
+openssl req -new -key client.key -out client.csr \
+    -subj "/CN=grpc-client"
+
+# Generate client certificate signed by the CA
+openssl x509 -req -in client.csr -CA ca.crt -CAkey ca.key -CAcreateserial \
+    -out client.crt -days 200 -sha256
+
+# Verify server certificate
+openssl verify -CAfile ca.crt server.crt
+
+# Verify client certificate
+openssl verify -CAfile ca.crt client.crt
+
+popd > /dev/null

.ci/server_ext.cnf

@@ -0,0 +1,10 @@
+[ v3_req ]
+keyUsage = critical, digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
+subjectAltName = @alt_names
+
+[ alt_names ]
+DNS.1 = localhost
+IP.1 = 127.0.0.1
+IP.2 = ::1
+

.github/workflows/ci.yml

@@ -160,6 +160,11 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
+
       - name: Install OS packages
         run: |
           sudo apt-get update
@@ -259,9 +264,10 @@ jobs:
           path: HTML-Documentation-tag-${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}.zip
           retention-days: 7
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
 
   build:
     name: Build
@@ -278,6 +284,11 @@ jobs:
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
+
       - name: Cache pip
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
@@ -313,75 +324,9 @@ jobs:
           path: src/ansys/fluent/core/generated
           # Combined cache key for all versions:
           # API-Code-<Cache version>-<PyFluent version>-<First Fluent release version>-<Last Fluent release version>-<Fluent dev version>-<Hash of codegen files>
-          key: API-Code-v${{ env.API_CODE_CACHE }}-${{ steps.version.outputs.PYFLUENT_VERSION }}-v23.1.0-v25.2.3-${{ vars.FLUENT_STABLE_IMAGE_DEV }}-${{ hashFiles('src/ansys/fluent/core/codegen/**') }}
+          key: API-Code-v${{ env.API_CODE_CACHE }}-${{ steps.version.outputs.PYFLUENT_VERSION }}-v24.2.0-v25.2.3-${{ vars.FLUENT_STABLE_IMAGE_DEV }}-${{ hashFiles('src/ansys/fluent/core/codegen/**') }}
           lookup-only: false # zizmor: ignore[cache-poisoning]
 
-      - name: Pull 23.1 Fluent docker image
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make docker-pull
-        env:
-          FLUENT_IMAGE_TAG: v23.1.0
-
-      - name: Run 23.1 API codegen
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make api-codegen
-        env:
-          FLUENT_IMAGE_TAG: v23.1.0
-          PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1
-
-      - name: Print 23.1 Fluent version info
-        run: |
-          cat src/ansys/fluent/core/generated/fluent_version_231.py
-          python -c "from src.ansys.fluent.core.generated.solver.settings_231 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
-
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
-      - name: Pull 23.2 Fluent docker image
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make docker-pull
-        env:
-          FLUENT_IMAGE_TAG: v23.2.0
-
-      - name: Run 23.2 API codegen
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make api-codegen
-        env:
-          FLUENT_IMAGE_TAG: v23.2.0
-          PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1
-
-      - name: Print 23.2 Fluent version info
-        run: |
-          cat src/ansys/fluent/core/generated/fluent_version_232.py
-          python -c "from src.ansys.fluent.core.generated.solver.settings_232 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
-
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
-      - name: Pull 24.1 Fluent docker image
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make docker-pull
-        env:
-          FLUENT_IMAGE_TAG: v24.1.0
-
-      - name: Run 24.1 API codegen
-        if: steps.cache-api-code.outputs.cache-hit != 'true'
-        run: make api-codegen
-        env:
-          FLUENT_IMAGE_TAG: v24.1.0
-          PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1
-
-      - name: Print 24.1 Fluent version info
-        run: |
-          cat src/ansys/fluent/core/generated/fluent_version_241.py
-          python -c "from src.ansys.fluent.core.generated.solver.settings_241 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
-
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
       - name: Pull 24.2 Fluent docker image
         if: steps.cache-api-code.outputs.cache-hit != 'true'
         run: make docker-pull
@@ -400,10 +345,6 @@ jobs:
           cat src/ansys/fluent/core/generated/fluent_version_242.py
           python -c "from src.ansys.fluent.core.generated.solver.settings_242 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
       - name: Pull 25.1 Fluent docker image
         if: steps.cache-api-code.outputs.cache-hit != 'true'
         run: make docker-pull
@@ -422,10 +363,6 @@ jobs:
           cat src/ansys/fluent/core/generated/fluent_version_251.py
           python -c "from src.ansys.fluent.core.generated.solver.settings_251 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
       - name: Pull 25.2 Fluent docker image
         if: steps.cache-api-code.outputs.cache-hit != 'true'
         run: make docker-pull
@@ -444,10 +381,6 @@ jobs:
           cat src/ansys/fluent/core/generated/fluent_version_252.py
           python -c "from src.ansys.fluent.core.generated.solver.settings_252 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
-
       - name: Pull 26.1 Fluent docker image
         if: steps.cache-api-code.outputs.cache-hit != 'true'
         run: make docker-pull
@@ -484,9 +417,10 @@ jobs:
             dist/*.tar.gz
           retention-days: 7
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
 
   test:
     name: Unit Testing
@@ -497,12 +431,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image-tag: v23.1.0
-            version: 231
-          - image-tag: v23.2.0
-            version: 232
-          - image-tag: v24.1.0
-            version: 241
           - image-tag: v24.2.5
             version: 242
           - image-tag: v25.1.4
@@ -526,6 +454,11 @@ jobs:
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
+
       - name: Download package
         if: ${{ !contains(github.event.pull_request.title, '[skip tests]') }}
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
@@ -564,20 +497,17 @@ jobs:
           make install-test
           make unittest-dev-${MATRIX_VERSION}
 
-      - name: Cleanup previous docker containers
-        if: always()
-        run: make cleanup-previous-docker-containers
-
       - name: Upload 25.2 Coverage Artifacts
         if: matrix.image-tag == 'v25.2.3'
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: coverage_report
           path: ./htmlcov
 
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
 
   nightly-dev-test:
     name: Release Testing
@@ -596,6 +526,11 @@ jobs:
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
+
       - name: Cache pip
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
@@ -651,13 +586,10 @@ jobs:
         env:
           FLUENT_IMAGE_TAG: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
 
-      - name: Cleanup previous docker containers
-        if: always()
-        run: make cleanup-previous-docker-containers
-
-      - name: Remove all docker images
-        if: always()
-        run: make docker-clean-images
+      - name: Clean Docker Data
+        run: make docker-clean-all-except-supported-images
+        env:
+          FLUENT_STABLE_IMAGE_DEV: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
 
   release:
     name: Release