diff --git a/.ci/pull_fluent_image.sh b/.ci/pull_fluent_image.sh index 8855e2feb6d1..4466f517c133 100644 --- a/.ci/pull_fluent_image.sh +++ b/.ci/pull_fluent_image.sh @@ -11,7 +11,7 @@ else fi # Pull fluent image based on tag -docker pull $_IMAGE_NAME +docker pull ghcr.io/ansys/fluent:v26.1.68 # Remove all dangling images -docker image prune -f \ No newline at end of file +docker image prune -f diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 822d0ae3f697..f07f5dd6760a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -293,137 +293,137 @@ jobs: # API-Code------ key: API-Code-v${{ env.API_CODE_CACHE }}-${{ steps.version.outputs.PYFLUENT_VERSION }}-v23.1.0-v25.2.0-${{ vars.FLUENT_STABLE_IMAGE_DEV }}-${{ hashFiles('src/ansys/fluent/core/codegen/**') }} - - 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 - env: - FLUENT_IMAGE_TAG: v24.2.0 - - - name: Run 24.2 API codegen - if: steps.cache-api-code.outputs.cache-hit != 'true' - run: make api-codegen - env: - FLUENT_IMAGE_TAG: v24.2.0 - PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 - - - name: Print 24.2 Fluent version info - run: | - 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 - env: - FLUENT_IMAGE_TAG: v25.1.0 - - - name: Run 25.1 API codegen - if: steps.cache-api-code.outputs.cache-hit != 'true' - run: make api-codegen - env: - FLUENT_IMAGE_TAG: v25.1.0 - PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 - - - name: Print 25.1 Fluent version info - run: | - 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 - env: - FLUENT_IMAGE_TAG: v25.2.0 - - - name: Run 25.2 API codegen - if: steps.cache-api-code.outputs.cache-hit != 'true' - run: make api-codegen - env: - FLUENT_IMAGE_TAG: v25.2.0 - PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 - - - name: Print 25.2 Fluent version info - run: | - 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 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 + # env: + # FLUENT_IMAGE_TAG: v24.2.0 + + # - name: Run 24.2 API codegen + # if: steps.cache-api-code.outputs.cache-hit != 'true' + # run: make api-codegen + # env: + # FLUENT_IMAGE_TAG: v24.2.0 + # PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 + + # - name: Print 24.2 Fluent version info + # run: | + # 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 + # env: + # FLUENT_IMAGE_TAG: v25.1.0 + + # - name: Run 25.1 API codegen + # if: steps.cache-api-code.outputs.cache-hit != 'true' + # run: make api-codegen + # env: + # FLUENT_IMAGE_TAG: v25.1.0 + # PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 + + # - name: Print 25.1 Fluent version info + # run: | + # 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 + # env: + # FLUENT_IMAGE_TAG: v25.2.0 + + # - name: Run 25.2 API codegen + # if: steps.cache-api-code.outputs.cache-hit != 'true' + # run: make api-codegen + # env: + # FLUENT_IMAGE_TAG: v25.2.0 + # PYFLUENT_CODEGEN_SKIP_BUILTIN_SETTINGS: 1 + + # - name: Print 25.2 Fluent version info + # run: | + # 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' @@ -474,18 +474,18 @@ 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.0 - version: 242 - - image-tag: v25.1.0 - version: 251 - - image-tag: v25.2.0 - version: 252 + # - 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.0 + # version: 242 + # - image-tag: v25.1.0 + # version: 251 + # - image-tag: v25.2.0 + # version: 252 - image-tag: v26.1.0 version: 261 timeout-minutes: 60 diff --git a/doc/changelog.d/4243.test.md b/doc/changelog.d/4243.test.md new file mode 100644 index 000000000000..d66678e8e42d --- /dev/null +++ b/doc/changelog.d/4243.test.md @@ -0,0 +1 @@ +Forcing image for testing purposes \ No newline at end of file diff --git a/src/ansys/fluent/core/launcher/fluent_container.py b/src/ansys/fluent/core/launcher/fluent_container.py index a654f72147a7..3947ed7d23bb 100644 --- a/src/ansys/fluent/core/launcher/fluent_container.py +++ b/src/ansys/fluent/core/launcher/fluent_container.py @@ -413,7 +413,7 @@ def configure_container_dict( else: raise FluentImageNameTagNotSpecified() - container_dict["fluent_image"] = fluent_image + container_dict["fluent_image"] = "ghcr.io/ansys/fluent:v26.1.68" if not pyfluent.FLUENT_AUTOMATIC_TRANSCRIPT: if "environment" not in container_dict: