From 240db17311b23db8cea6d9a2204f8a23cdd72792 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:35:08 +0100 Subject: [PATCH 01/29] chore: empty commit From 561695d45ba48ad992b6a49abd75e6bff061ecd7 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:36:24 +0000 Subject: [PATCH 02/29] chore: adding changelog file 4319.fixed.md [dependabot-skip] --- doc/changelog.d/4319.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/4319.fixed.md diff --git a/doc/changelog.d/4319.fixed.md b/doc/changelog.d/4319.fixed.md new file mode 100644 index 00000000000..da490bb7c04 --- /dev/null +++ b/doc/changelog.d/4319.fixed.md @@ -0,0 +1 @@ +Cicd From 2a8563a35da721c838621cff9ae3b19b054e415c Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:04:03 +0100 Subject: [PATCH 03/29] feat: add log upload options with encryption for local and remote testing workflows --- .github/workflows/test-local.yml | 49 +++++++++++++++++++++++++++---- .github/workflows/test-remote.yml | 49 +++++++++++++++++++++++++++---- 2 files changed, 86 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index bce0a912d94..86805c23d4f 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -45,6 +45,13 @@ on: required: false type: boolean default: false + + skip-log-upload: + description: | + If true, logs will not be uploaded (for security). Set to false to enable encrypted log upload. + required: false + type: boolean + default: true file-name: description: | @@ -97,6 +104,11 @@ on: description: | Token for Codecov. required: true + + log-encryption-key: + description: | + Encryption key for sensitive log files. + required: false token: description: | @@ -295,12 +307,37 @@ jobs: run: | .ci/collect_mapdl_logs_locals.sh - # - name: "Upload logs to GitHub" - # if: always() - # uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 - # with: - # name: logs-${{ inputs.file-name }}.tgz - # path: ./logs-${{ inputs.file-name }}.tgz + - name: "Encrypt and upload logs to GitHub" + if: always() && inputs.skip-log-upload == false + env: + ENCRYPTION_KEY: ${{ secrets.log-encryption-key }} + FILE_NAME: ${{ inputs.file-name }} + shell: bash + run: | + # Check if logs exist + if [ -f "./logs-${FILE_NAME}.tgz" ]; then + echo "Encrypting logs..." + + # Encrypt using OpenSSL (already available in container) + openssl enc -aes-256-cbc -salt -pbkdf2 \ + -in ./logs-${FILE_NAME}.tgz \ + -out ./logs-${FILE_NAME}.tgz.enc \ + -pass env:ENCRYPTION_KEY + + echo "Logs encrypted successfully" + echo "To decrypt locally, use:" + echo "openssl enc -aes-256-cbc -d -pbkdf2 -in logs-${FILE_NAME}.tgz.enc -out logs-${FILE_NAME}.tgz -pass pass:YOUR_KEY" + else + echo "No log file found to encrypt" + fi + + - name: "Upload encrypted logs to GitHub" + if: always() && inputs.skip-log-upload == false + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 + with: + name: logs-${{ inputs.file-name }}-encrypted + path: ./logs-${{ inputs.file-name }}.tgz.enc + retention-days: 3 - name: "Display files structure" if: always() diff --git a/.github/workflows/test-remote.yml b/.github/workflows/test-remote.yml index fc67e101eca..c20899703fc 100644 --- a/.github/workflows/test-remote.yml +++ b/.github/workflows/test-remote.yml @@ -18,6 +18,13 @@ on: required: true type: string + skip-log-upload: + description: | + If true, logs will not be uploaded (for security). Set to false to enable encrypted log upload. + required: false + type: boolean + default: true + python-version: description: | Python version to use. @@ -46,6 +53,11 @@ on: Token for Codecov. required: true + log-encryption-key: + description: | + Encryption key for sensitive log files. + required: false + permissions: {} jobs: @@ -320,12 +332,37 @@ jobs: run: | .ci/collect_mapdl_logs_remote.sh - # - name: "Upload logs to GitHub" - # if: always() - # uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 - # with: - # name: logs-${{ inputs.file-name }}.tgz - # path: ./logs-${{ inputs.file-name }}.tgz + - name: "Encrypt and upload logs to GitHub" + if: always() && inputs.skip-log-upload == false + env: + ENCRYPTION_KEY: ${{ secrets.log-encryption-key }} + FILE_NAME: ${{ inputs.file-name }} + shell: bash + run: | + # Check if logs exist + if [ -f "./logs-${FILE_NAME}.tgz" ]; then + echo "Encrypting logs..." + + # Encrypt using OpenSSL + openssl enc -aes-256-cbc -salt -pbkdf2 \ + -in ./logs-${FILE_NAME}.tgz \ + -out ./logs-${FILE_NAME}.tgz.enc \ + -pass env:ENCRYPTION_KEY + + echo "Logs encrypted successfully" + echo "To decrypt locally, use:" + echo "openssl enc -aes-256-cbc -d -pbkdf2 -in logs-${FILE_NAME}.tgz.enc -out logs-${FILE_NAME}.tgz -pass pass:YOUR_KEY" + else + echo "No log file found to encrypt" + fi + + - name: "Upload encrypted logs to GitHub" + if: always() && inputs.skip-log-upload == false + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 + with: + name: logs-${{ inputs.file-name }}-encrypted + path: ./logs-${{ inputs.file-name }}.tgz.enc + retention-days: 3 - name: "Display files structure" if: always() From 801fef7daaa6440982595cd6eb549bf2a7e471b4 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:06:20 +0100 Subject: [PATCH 04/29] chore: clean up whitespace in workflow YAML files --- .github/workflows/test-local.yml | 22 +++++++++++----------- .github/workflows/test-remote.yml | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index 86805c23d4f..c8282a4cb53 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -31,21 +31,21 @@ on: required: false type: boolean default: false - + test_dpf: description: | If true, the DPF tests will be run. required: false type: boolean default: true - + on-console: description: | If true, the tests will be run on console. required: false type: boolean default: false - + skip-log-upload: description: | If true, logs will not be uploaded (for security). Set to false to enable encrypted log upload. @@ -79,7 +79,7 @@ on: required: false type: string default: ghcr.io/ansys/mapdl - + runner: description: | Runner to use. @@ -93,7 +93,7 @@ on: required: false type: string default: "3.12" - + secrets: license-server: description: | @@ -109,12 +109,12 @@ on: description: | Encryption key for sensitive log files. required: false - + token: description: | Token for GitHub. Used also for login into ghcr.io. required: true - + username: description: | GitHub username for login into ghcr.io. @@ -186,13 +186,13 @@ jobs: echo "TAG_STUDENT: $TAG_STUDENT" echo "ON_STUDENT=$(echo $ON_STUDENT)" >> $GITHUB_OUTPUT echo "TAG_STUDENT=$(echo $TAG_STUDENT)" >> $GITHUB_OUTPUT - + - name: "Install gcc" shell: bash if: ${{ contains(inputs.mapdl-version, 'cicd') }} run: | apt-get update && apt-get -y install gcc mono-mcs g++ - + - name: "Installing minimal OS packages" shell: bash @@ -317,13 +317,13 @@ jobs: # Check if logs exist if [ -f "./logs-${FILE_NAME}.tgz" ]; then echo "Encrypting logs..." - + # Encrypt using OpenSSL (already available in container) openssl enc -aes-256-cbc -salt -pbkdf2 \ -in ./logs-${FILE_NAME}.tgz \ -out ./logs-${FILE_NAME}.tgz.enc \ -pass env:ENCRYPTION_KEY - + echo "Logs encrypted successfully" echo "To decrypt locally, use:" echo "openssl enc -aes-256-cbc -d -pbkdf2 -in logs-${FILE_NAME}.tgz.enc -out logs-${FILE_NAME}.tgz -pass pass:YOUR_KEY" diff --git a/.github/workflows/test-remote.yml b/.github/workflows/test-remote.yml index c20899703fc..9a18cfb0478 100644 --- a/.github/workflows/test-remote.yml +++ b/.github/workflows/test-remote.yml @@ -37,7 +37,7 @@ on: description: | Username for the GitHub container registry. required: true - + token: description: | Token for GitHub. @@ -47,7 +47,7 @@ on: description: | License server for ANSYS MAPDL required: true - + codecov-token: description: | Token for Codecov. @@ -166,7 +166,7 @@ jobs: echo "TAG_STUDENT: $TAG_STUDENT" echo "ON_STUDENT=$(echo $ON_STUDENT)" >> $GITHUB_OUTPUT echo "TAG_STUDENT=$(echo $TAG_STUDENT)" >> $GITHUB_OUTPUT - + - name: "Pull, launch, and validate MAPDL service" id: start_mapdl env: @@ -342,13 +342,13 @@ jobs: # Check if logs exist if [ -f "./logs-${FILE_NAME}.tgz" ]; then echo "Encrypting logs..." - + # Encrypt using OpenSSL openssl enc -aes-256-cbc -salt -pbkdf2 \ -in ./logs-${FILE_NAME}.tgz \ -out ./logs-${FILE_NAME}.tgz.enc \ -pass env:ENCRYPTION_KEY - + echo "Logs encrypted successfully" echo "To decrypt locally, use:" echo "openssl enc -aes-256-cbc -d -pbkdf2 -in logs-${FILE_NAME}.tgz.enc -out logs-${FILE_NAME}.tgz -pass pass:YOUR_KEY" From 9cec690b5ea2f51ed267f484bcd39e2e7f190713 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:12:37 +0100 Subject: [PATCH 05/29] feat: add upload logs option for local and remote testing workflows --- .github/workflows/ci.yml | 9 ++++++--- .github/workflows/test-local.yml | 10 +++++----- .github/workflows/test-remote.yml | 10 +++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a92555a420..f22996cffe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ env: PACKAGE_NAME: 'ansys-mapdl-core' PACKAGE_NAMESPACE: 'ansys.mapdl.core' DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com' + upload_logs: true concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -44,7 +45,7 @@ jobs: permissions: pull-requests: write steps: - - uses: actions-ecosystem/action-add-assignees@a5b84af721c4a621eb9c7a4a95ec20a90d0b88e9 #v1.0.1 + - uses: actions-ecosystem/action-add-assignees@a5b84af721c4a621eb9c7a4a95ec20a90d0b88e9 #v1.0.1 if: | ( github.event_name == 'pull_request' && @@ -241,7 +242,7 @@ jobs: with: mapdl-version: "${{ matrix.mapdl-version }}" file-name: "remote-${{ matrix.mapdl-version }}" - + upload-logs: ${{ env.upload_logs }} build-test-local-matrix: name: "Build test matrix for minimal and local" @@ -290,6 +291,7 @@ jobs: tags: "local" latest-version: "252" test_dpf: ${{ contains(matrix.mapdl-version, 'cicd') }} + upload-logs: ${{ env.upload_logs }} build-test-ubuntu-minimal: @@ -317,6 +319,7 @@ jobs: tags: "local,minimal" latest-version: "252" test_dpf: false + upload-logs: ${{ env.upload_logs }} build-test-ubuntu-console: @@ -345,7 +348,7 @@ jobs: file-name: "${{ matrix.mapdl-version }}-console" tags: "local,console" test_dpf: false - + upload-logs: ${{ env.upload_logs }} package: name: "Package library" diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index c8282a4cb53..fc66731fce5 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -46,12 +46,12 @@ on: type: boolean default: false - skip-log-upload: + upload-logs: description: | - If true, logs will not be uploaded (for security). Set to false to enable encrypted log upload. + If true, logs will be uploaded encrypted. Set to false to disable log upload (for security). required: false type: boolean - default: true + default: false file-name: description: | @@ -308,7 +308,7 @@ jobs: .ci/collect_mapdl_logs_locals.sh - name: "Encrypt and upload logs to GitHub" - if: always() && inputs.skip-log-upload == false + if: always() && inputs.upload-logs == true env: ENCRYPTION_KEY: ${{ secrets.log-encryption-key }} FILE_NAME: ${{ inputs.file-name }} @@ -332,7 +332,7 @@ jobs: fi - name: "Upload encrypted logs to GitHub" - if: always() && inputs.skip-log-upload == false + if: always() && inputs.upload-logs == true uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 with: name: logs-${{ inputs.file-name }}-encrypted diff --git a/.github/workflows/test-remote.yml b/.github/workflows/test-remote.yml index 9a18cfb0478..37e758f6920 100644 --- a/.github/workflows/test-remote.yml +++ b/.github/workflows/test-remote.yml @@ -18,12 +18,12 @@ on: required: true type: string - skip-log-upload: + upload-logs: description: | - If true, logs will not be uploaded (for security). Set to false to enable encrypted log upload. + If true, logs will be uploaded encrypted. Set to false to disable log upload (for security). required: false type: boolean - default: true + default: false python-version: description: | @@ -333,7 +333,7 @@ jobs: .ci/collect_mapdl_logs_remote.sh - name: "Encrypt and upload logs to GitHub" - if: always() && inputs.skip-log-upload == false + if: always() && inputs.upload-logs == true env: ENCRYPTION_KEY: ${{ secrets.log-encryption-key }} FILE_NAME: ${{ inputs.file-name }} @@ -357,7 +357,7 @@ jobs: fi - name: "Upload encrypted logs to GitHub" - if: always() && inputs.skip-log-upload == false + if: always() && inputs.upload-logs == true uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 with: name: logs-${{ inputs.file-name }}-encrypted From 5fcf6e29de0f99cdf33c0707f7bfbe19b0467889 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:15:07 +0100 Subject: [PATCH 06/29] feat: add log encryption key to CI jobs for enhanced security --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f22996cffe4..fe7cd3d1699 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -239,6 +239,7 @@ jobs: codecov-token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }} username: ${{ github.actor }} + log-encryption-key: ${{ secrets.LOG_ENCRYPTION_KEY }} with: mapdl-version: "${{ matrix.mapdl-version }}" file-name: "remote-${{ matrix.mapdl-version }}" @@ -283,6 +284,7 @@ jobs: codecov-token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }} username: ${{ github.actor }} + log-encryption-key: ${{ secrets.LOG_ENCRYPTION_KEY }} with: testing-minimal: false pytest-arguments: '--reset_only_failed --add_missing_images' @@ -311,6 +313,7 @@ jobs: codecov-token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }} username: ${{ github.actor }} + log-encryption-key: ${{ secrets.LOG_ENCRYPTION_KEY }} with: testing-minimal: true pytest-arguments: '' @@ -339,6 +342,7 @@ jobs: codecov-token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }} username: ${{ github.actor }} + log-encryption-key: ${{ secrets.LOG_ENCRYPTION_KEY }} with: latest-version: "252" mapdl-version: ${{ matrix.mapdl-version }} From fe344ce3e9cac8329c06535fd8ce965790b7ef1b Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 12:35:30 +0100 Subject: [PATCH 07/29] fix: set upload-logs to true in CI jobs for consistent logging --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe7cd3d1699..8165fb9a0d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,6 @@ env: PACKAGE_NAME: 'ansys-mapdl-core' PACKAGE_NAMESPACE: 'ansys.mapdl.core' DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com' - upload_logs: true concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -243,7 +242,7 @@ jobs: with: mapdl-version: "${{ matrix.mapdl-version }}" file-name: "remote-${{ matrix.mapdl-version }}" - upload-logs: ${{ env.upload_logs }} + upload-logs: true build-test-local-matrix: name: "Build test matrix for minimal and local" @@ -293,7 +292,7 @@ jobs: tags: "local" latest-version: "252" test_dpf: ${{ contains(matrix.mapdl-version, 'cicd') }} - upload-logs: ${{ env.upload_logs }} + upload-logs: true build-test-ubuntu-minimal: @@ -322,7 +321,7 @@ jobs: tags: "local,minimal" latest-version: "252" test_dpf: false - upload-logs: ${{ env.upload_logs }} + upload-logs: true build-test-ubuntu-console: @@ -352,7 +351,7 @@ jobs: file-name: "${{ matrix.mapdl-version }}-console" tags: "local,console" test_dpf: false - upload-logs: ${{ env.upload_logs }} + upload-logs: true package: name: "Package library" From aaa0b3ede370972df2e2f4751d30cb7cc85d5bc2 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 17:29:00 +0100 Subject: [PATCH 08/29] fix: remove unnecessary './' prefix from log file paths in display_logs_locals.sh --- .ci/display_logs_locals.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/display_logs_locals.sh b/.ci/display_logs_locals.sh index af1558ab175..325c1e5e860 100755 --- a/.ci/display_logs_locals.sh +++ b/.ci/display_logs_locals.sh @@ -17,19 +17,19 @@ ##### # Displaying files -FILE_PAT=./"$LOG_NAMES"/pymapdl.log +FILE_PAT="$LOG_NAMES"/pymapdl.log FILE_DESCRIPTION="PyMAPDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT=./"$LOG_NAMES"/pymapdl.apdl +FILE_PAT="$LOG_NAMES"/pymapdl.apdl FILE_DESCRIPTION="PyMAPDL APDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT=./"$LOG_NAMES"/apdl.out +FILE_PAT="$LOG_NAMES"/apdl.out FILE_DESCRIPTION="MAPDL Output" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" \ No newline at end of file From 7a850f81b7fe5c6c756ec33ab909ff1f2b31a514 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 17:30:38 +0100 Subject: [PATCH 09/29] fix: update ubuntu version identifiers in build_matrix.sh for consistency --- .ci/build_matrix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index 5110185ddf2..2b9396f2244 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -11,10 +11,10 @@ versions=( 'latest-ubuntu-student' 'v25.2.0' 'v25.1.0' - 'v25.1-ubuntu' + 'v25.1-ubuntu-cicd' 'v25.1-ubuntu-student' 'v24.2.0' - 'v24.2-ubuntu' + 'v24.2-ubuntu-cicd' 'v24.1.0' 'v24.1-ubuntu' 'v23.2.0' From 29d0adec1fc6f46923211cb33339a874b37c6a08 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 18:20:53 +0100 Subject: [PATCH 10/29] fix: enhance log display in display_logs_remote.sh for better debugging --- .ci/display_logs_remote.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.ci/display_logs_remote.sh b/.ci/display_logs_remote.sh index f58979ee97c..2a9891ff5d4 100755 --- a/.ci/display_logs_remote.sh +++ b/.ci/display_logs_remote.sh @@ -8,6 +8,13 @@ echo "::group:: Display files structure" && docker exec "$MAPDL_INSTANCE" /bin/b echo "::group:: Display docker run log" && cat log.txt && echo "::endgroup::" +# Displaying Docker stdout log +FILE_PAT="./$LOG_NAMES/mapdl_launch_*.log" +if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker launch $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." + +FILE_PAT="./$LOG_NAMES/MAPDL_*.log" +if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker output $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." + # Displaying MAPDL files FILE_PAT="./$LOG_NAMES/*.err" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Error file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'err' files." From 3f64caeb6491cff81e4b3c9d3fd43df2d76aabf9 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 18:34:41 +0100 Subject: [PATCH 11/29] fix: add MPI environment variable for CICD version in start_mapdl.sh --- .ci/entrypoint.sh | 4 +++- .ci/start_mapdl.sh | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.ci/entrypoint.sh b/.ci/entrypoint.sh index ca61a1ee21d..40cd8460c3b 100755 --- a/.ci/entrypoint.sh +++ b/.ci/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash + export OMPI_ALLOW_RUN_AS_ROOT=1 export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 @@ -15,6 +16,7 @@ if [ -n "${ANSYS_DPF_ACCEPT_LA}" ]; then fi fi + echo "RUN_DPF_SERVER: $RUN_DPF_SERVER" if [ "$RUN_DPF_SERVER" == "true" ]; then @@ -26,4 +28,4 @@ fi echo "Starting MAPDL..." echo "Using executable path: ${EXEC_PATH}" -$EXEC_PATH -grpc -dir /jobs -"${DISTRIBUTED_MODE}" -np 2 -db -6000 -m -6000 - \ No newline at end of file +$EXEC_PATH -grpc -dir /jobs -"${DISTRIBUTED_MODE}" -np 2 -db -6000 -m -6000 "$@" - \ No newline at end of file diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index 07d418fd4e9..636653c818d 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -79,10 +79,15 @@ if [[ $MAPDL_VERSION == *"cicd"* ]] ; then echo "Overriding DISTRIBUTED_MODE to 'dmp' for CICD version" export DISTRIBUTED_MODE="dmp" + + echo "Using OpenMPI for CICD version" + export MPI="-mpi openmpi" + else export DPF_PORT_ARG="" export DB_INT_PORT=50055 export DPF_ON="" + export MPI="" fi; echo "EXEC_PATH: $EXEC_PATH" @@ -116,7 +121,7 @@ run \ --memory=6656MB \ --memory-swap=16896MB \ --mount type=bind,src=${PWD}/.ci/entrypoint.sh,dst=/entrypoint.sh \ - ${MAPDL_IMAGE} /entrypoint.sh + ${MAPDL_IMAGE} /entrypoint.sh ${MPI} _EOT_ ) From 692964ef33b46f1a8e7115daf642c44d673be549 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 21:45:04 +0100 Subject: [PATCH 12/29] fix: add MPI switches for CICD version in test-local workflow --- .github/workflows/test-local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index fc66731fce5..08d5b64ef4b 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -180,6 +180,7 @@ jobs: if [[ "${MAPDL_VERSION}" == *"cicd"* ]]; then echo "CICD MAPDL version detected, testing DPF backend for results module."; echo "TEST_DPF_BACKEND=true" >> $GITHUB_ENV; + echo "PYMAPDL_ADDITIONAL_SWITCHES='-mpi openmpi'" >> $GITHUB_ENV; fi echo "ON_STUDENT: $ON_STUDENT" From 282ef460a577554d303503b33ab0ddf8060055d0 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 21:45:53 +0100 Subject: [PATCH 13/29] fix: quote MPI variable in docker run command for proper handling --- .ci/start_mapdl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index 636653c818d..fac43d9fa39 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -121,7 +121,7 @@ run \ --memory=6656MB \ --memory-swap=16896MB \ --mount type=bind,src=${PWD}/.ci/entrypoint.sh,dst=/entrypoint.sh \ - ${MAPDL_IMAGE} /entrypoint.sh ${MPI} + ${MAPDL_IMAGE} /entrypoint.sh "${MPI}" _EOT_ ) From 5d01e361f816f01465e6eaf9b662234b86c4f4cd Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Tue, 25 Nov 2025 22:33:50 +0100 Subject: [PATCH 14/29] fix: remove quotes around MPI variable in docker run command for proper execution --- .ci/start_mapdl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index fac43d9fa39..636653c818d 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -121,7 +121,7 @@ run \ --memory=6656MB \ --memory-swap=16896MB \ --mount type=bind,src=${PWD}/.ci/entrypoint.sh,dst=/entrypoint.sh \ - ${MAPDL_IMAGE} /entrypoint.sh "${MPI}" + ${MAPDL_IMAGE} /entrypoint.sh ${MPI} _EOT_ ) From bbbc830f0d017e148cc3d233e61a1f781ff65530 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 10:38:24 +0100 Subject: [PATCH 15/29] fix: remove quotes around MPI switches in CICD testing for proper environment variable handling --- .github/workflows/test-local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index 08d5b64ef4b..83d255ebb30 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -180,7 +180,7 @@ jobs: if [[ "${MAPDL_VERSION}" == *"cicd"* ]]; then echo "CICD MAPDL version detected, testing DPF backend for results module."; echo "TEST_DPF_BACKEND=true" >> $GITHUB_ENV; - echo "PYMAPDL_ADDITIONAL_SWITCHES='-mpi openmpi'" >> $GITHUB_ENV; + echo "PYMAPDL_ADDITIONAL_SWITCHES=-mpi openmpi" >> $GITHUB_ENV; fi echo "ON_STUDENT: $ON_STUDENT" From f6c71b593a8ca58017334b8fbbcd392798abe96d Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 10:53:56 +0100 Subject: [PATCH 16/29] fix: remove quotes around LOG_NAMES variable in log display scripts for consistency --- .ci/display_logs_locals.sh | 6 +++--- .ci/display_logs_remote.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/display_logs_locals.sh b/.ci/display_logs_locals.sh index 325c1e5e860..a7eb58179d5 100755 --- a/.ci/display_logs_locals.sh +++ b/.ci/display_logs_locals.sh @@ -17,19 +17,19 @@ ##### # Displaying files -FILE_PAT="$LOG_NAMES"/pymapdl.log +FILE_PAT=${LOG_NAMES}/pymapdl.log FILE_DESCRIPTION="PyMAPDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT="$LOG_NAMES"/pymapdl.apdl +FILE_PAT=${LOG_NAMES}/pymapdl.apdl FILE_DESCRIPTION="PyMAPDL APDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT="$LOG_NAMES"/apdl.out +FILE_PAT=${LOG_NAMES}/apdl.out FILE_DESCRIPTION="MAPDL Output" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" \ No newline at end of file diff --git a/.ci/display_logs_remote.sh b/.ci/display_logs_remote.sh index 2a9891ff5d4..e7b0aab1e53 100755 --- a/.ci/display_logs_remote.sh +++ b/.ci/display_logs_remote.sh @@ -9,18 +9,18 @@ echo "::group:: Display files structure" && docker exec "$MAPDL_INSTANCE" /bin/b echo "::group:: Display docker run log" && cat log.txt && echo "::endgroup::" # Displaying Docker stdout log -FILE_PAT="./$LOG_NAMES/mapdl_launch_*.log" +FILE_PAT="./${LOG_NAMES}/mapdl_launch_*.log" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker launch $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." -FILE_PAT="./$LOG_NAMES/MAPDL_*.log" +FILE_PAT="./${LOG_NAMES}/MAPDL_*.log" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker output $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." # Displaying MAPDL files -FILE_PAT="./$LOG_NAMES/*.err" +FILE_PAT="./${LOG_NAMES}/*.err" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Error file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'err' files." -FILE_PAT="./$LOG_NAMES/*.log" +FILE_PAT="./${LOG_NAMES}/*.log" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Log file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." -FILE_PAT="./$LOG_NAMES/*.out" +FILE_PAT="./${LOG_NAMES}/*.out" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Output file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'output' files." From 9795ef37f17975ce52083cff64df7e918849170f Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 10:54:48 +0100 Subject: [PATCH 17/29] fix: reduce maxfail and reruns in pytest arguments for local and remote testing --- .github/workflows/test-local.yml | 2 +- .github/workflows/test-remote.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-local.yml b/.github/workflows/test-local.yml index 83d255ebb30..fb76e7a0df8 100644 --- a/.github/workflows/test-local.yml +++ b/.github/workflows/test-local.yml @@ -138,7 +138,7 @@ jobs: TESTING_MINIMAL: ${{ inputs.testing-minimal }} P_SCHEMA: "/ansys_inc/v241/ansys/ac4/schema" PYTEST_TIMEOUT: 120 # seconds. Limit the duration for each unit test - PYTEST_ARGUMENTS: '-vvv -ra --color=yes --durations=30 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180 --profile-svg --profile --report-log-exclude-logs-on-passed-tests --strict-markers' + PYTEST_ARGUMENTS: '-vvv -ra --color=yes --durations=30 --random-order --random-order-bucket=class --maxfail=2 --reruns 2 --reruns-delay 2 --cov=ansys.mapdl.core --cov-report=html --timeout=180 --profile-svg --profile --report-log-exclude-logs-on-passed-tests --strict-markers' OMPI_ALLOW_RUN_AS_ROOT: 1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 DATAPROCESSING_DEBUG: /home/mapdl/dpf_logs diff --git a/.github/workflows/test-remote.yml b/.github/workflows/test-remote.yml index 37e758f6920..dc7f74fea57 100644 --- a/.github/workflows/test-remote.yml +++ b/.github/workflows/test-remote.yml @@ -85,7 +85,7 @@ jobs: DPF_START_SERVER: False HAS_DPF: True TEST_DPF_BACKEND: false - PYTEST_ARGUMENTS: '-vvv -ra --color=yes --durations=30 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180 --profile-svg --profile --report-log-exclude-logs-on-passed-tests --strict-markers' + PYTEST_ARGUMENTS: '-vvv -ra --color=yes --durations=30 --random-order --random-order-bucket=class --maxfail=2 --reruns 2 --reruns-delay 2 --cov=ansys.mapdl.core --cov-report=html --timeout=180 --profile-svg --profile --report-log-exclude-logs-on-passed-tests --strict-markers' MAPDL_PACKAGE: ghcr.io/ansys/mapdl steps: From c637c1c7f737140e9109b1fdffb61da69f46a6eb Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:24:25 +0100 Subject: [PATCH 18/29] fix: add MAPDL_IMAGE environment variable to start_mapdl.sh for Docker container --- .ci/entrypoint.sh | 10 +++++++++- .ci/start_mapdl.sh | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.ci/entrypoint.sh b/.ci/entrypoint.sh index 40cd8460c3b..6e1e51a42ec 100755 --- a/.ci/entrypoint.sh +++ b/.ci/entrypoint.sh @@ -25,7 +25,15 @@ if [ "$RUN_DPF_SERVER" == "true" ]; then echo "DPF server started." fi +if [[ $MAPDL_VERSION == *"cicd"* ]] ; then + echo "Using OpenMPI for CICD version" + export MPI="-mpi openmpi" + +else + export MPI="" +fi; + echo "Starting MAPDL..." echo "Using executable path: ${EXEC_PATH}" -$EXEC_PATH -grpc -dir /jobs -"${DISTRIBUTED_MODE}" -np 2 -db -6000 -m -6000 "$@" - \ No newline at end of file +$EXEC_PATH -grpc -dir /jobs -"${DISTRIBUTED_MODE}" -np 2 -db -6000 -m -6000 "${MPI}" - \ No newline at end of file diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index 636653c818d..d6a29438ef4 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -113,6 +113,7 @@ run \ -e DPF_PORT_INTERNAL=${DPF_PORT_INTERNAL} \ -e EXEC_PATH=${EXEC_PATH} \ -e DISTRIBUTED_MODE=${DISTRIBUTED_MODE} \ + -e MAPDL_IMAGE=${MAPDL_IMAGE} \ --shm-size=2gb \ -e I_MPI_SHM_LMT=shm \ -e P_SCHEMA=${P_SCHEMA} \ From c07b83038ae27d6e8cc8737e92da4e4f94fe10be Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:24:36 +0100 Subject: [PATCH 19/29] fix: update mapdl-version in CI configuration for consistency across builds --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8165fb9a0d7..b04d92d31f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -306,7 +306,7 @@ jobs: strategy: fail-fast: false matrix: - mapdl-version: ['v25.2-ubuntu-cicd', 'v25.1-ubuntu'] + mapdl-version: ['v25.2-ubuntu-cicd', 'v25.1-ubuntu-cicd'] secrets: license-server: ${{ secrets.LICENSE_SERVER }} codecov-token: ${{ secrets.CODECOV_TOKEN }} @@ -335,7 +335,7 @@ jobs: strategy: fail-fast: false matrix: - mapdl-version: ['v25.2-ubuntu-cicd', 'v25.1-ubuntu'] + mapdl-version: ['v25.2-ubuntu-cicd', 'v25.1-ubuntu-cicd'] secrets: license-server: ${{ secrets.LICENSE_SERVER }} codecov-token: ${{ secrets.CODECOV_TOKEN }} From eaf1c536eda82ff19ed81a4468c66149665a43dd Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:54:31 +0100 Subject: [PATCH 20/29] fix: update test_dpf condition to exclude version 24 in CI configuration --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b04d92d31f7..2b1a88c6c1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -291,7 +291,7 @@ jobs: file-name: "local-${{ matrix.mapdl-version }}" tags: "local" latest-version: "252" - test_dpf: ${{ contains(matrix.mapdl-version, 'cicd') }} + test_dpf: ${{ contains(matrix.mapdl-version, 'cicd') && !contains(matrix.mapdl-version, '24') }} upload-logs: true From cc2afb0bb07526256defae2bf30c62ac6448c1ab Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:54:52 +0100 Subject: [PATCH 21/29] fix: remove MPI argument from docker run command in start_mapdl.sh --- .ci/start_mapdl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index d6a29438ef4..609fcf03f01 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -122,7 +122,7 @@ run \ --memory=6656MB \ --memory-swap=16896MB \ --mount type=bind,src=${PWD}/.ci/entrypoint.sh,dst=/entrypoint.sh \ - ${MAPDL_IMAGE} /entrypoint.sh ${MPI} + ${MAPDL_IMAGE} /entrypoint.sh _EOT_ ) From 2de6eccb7f1c3d3a1821d1b41c6a3710d5a2b6ef Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:24:08 +0100 Subject: [PATCH 22/29] fix: remove 'v24.2-ubuntu-cicd' from version list in build_matrix.sh --- .ci/build_matrix.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index 2b9396f2244..9f049203c4a 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -14,7 +14,6 @@ versions=( 'v25.1-ubuntu-cicd' 'v25.1-ubuntu-student' 'v24.2.0' - 'v24.2-ubuntu-cicd' 'v24.1.0' 'v24.1-ubuntu' 'v23.2.0' From c98ea95c1dc886358f4cf3c660c897ce03e2ddbb Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:24:30 +0100 Subject: [PATCH 23/29] fix: remove MPI argument for non-CICD versions in start_mapdl.sh --- .ci/start_mapdl.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index 609fcf03f01..3ce38a16d82 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -80,14 +80,10 @@ if [[ $MAPDL_VERSION == *"cicd"* ]] ; then echo "Overriding DISTRIBUTED_MODE to 'dmp' for CICD version" export DISTRIBUTED_MODE="dmp" - echo "Using OpenMPI for CICD version" - export MPI="-mpi openmpi" - else export DPF_PORT_ARG="" export DB_INT_PORT=50055 export DPF_ON="" - export MPI="" fi; echo "EXEC_PATH: $EXEC_PATH" From 9bb22e1f36e58bfb39d64d935af0dea3463b7b1c Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:25:02 +0100 Subject: [PATCH 24/29] fix: add echo statement for default MPI version in entrypoint.sh --- .ci/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/entrypoint.sh b/.ci/entrypoint.sh index 6e1e51a42ec..669cc1d0bfb 100755 --- a/.ci/entrypoint.sh +++ b/.ci/entrypoint.sh @@ -30,6 +30,7 @@ if [[ $MAPDL_VERSION == *"cicd"* ]] ; then export MPI="-mpi openmpi" else + echo "Using default MPI version" export MPI="" fi; From c261b0e1f9d5326b500ce0396dde14b4fa954414 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:25:48 +0100 Subject: [PATCH 25/29] Revert display_logs scripts to match main --- .ci/display_logs_locals.sh | 6 +++--- .ci/display_logs_remote.sh | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.ci/display_logs_locals.sh b/.ci/display_logs_locals.sh index a7eb58179d5..af1558ab175 100755 --- a/.ci/display_logs_locals.sh +++ b/.ci/display_logs_locals.sh @@ -17,19 +17,19 @@ ##### # Displaying files -FILE_PAT=${LOG_NAMES}/pymapdl.log +FILE_PAT=./"$LOG_NAMES"/pymapdl.log FILE_DESCRIPTION="PyMAPDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT=${LOG_NAMES}/pymapdl.apdl +FILE_PAT=./"$LOG_NAMES"/pymapdl.apdl FILE_DESCRIPTION="PyMAPDL APDL log" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" ##### -FILE_PAT=${LOG_NAMES}/apdl.out +FILE_PAT=./"$LOG_NAMES"/apdl.out FILE_DESCRIPTION="MAPDL Output" (echo "::group:: $FILE_DESCRIPTION: $FILE_PAT" && cat "$FILE_PAT" && echo "::endgroup::") || echo "Failed to show $FILE_DESCRIPTION file" \ No newline at end of file diff --git a/.ci/display_logs_remote.sh b/.ci/display_logs_remote.sh index e7b0aab1e53..f58979ee97c 100755 --- a/.ci/display_logs_remote.sh +++ b/.ci/display_logs_remote.sh @@ -8,19 +8,12 @@ echo "::group:: Display files structure" && docker exec "$MAPDL_INSTANCE" /bin/b echo "::group:: Display docker run log" && cat log.txt && echo "::endgroup::" -# Displaying Docker stdout log -FILE_PAT="./${LOG_NAMES}/mapdl_launch_*.log" -if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker launch $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." - -FILE_PAT="./${LOG_NAMES}/MAPDL_*.log" -if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: MAPDL docker output $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." - # Displaying MAPDL files -FILE_PAT="./${LOG_NAMES}/*.err" +FILE_PAT="./$LOG_NAMES/*.err" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Error file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'err' files." -FILE_PAT="./${LOG_NAMES}/*.log" +FILE_PAT="./$LOG_NAMES/*.log" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Log file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files." -FILE_PAT="./${LOG_NAMES}/*.out" +FILE_PAT="./$LOG_NAMES/*.out" if compgen -G "$FILE_PAT" > /dev/null ;then for f in $FILE_PAT; do echo "::group:: Output file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'output' files." From 53aa89073c49797120946aac096e6486aef0cce9 Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:26:34 +0100 Subject: [PATCH 26/29] revert: "fix: remove 'v24.2-ubuntu-cicd' from version list in build_matrix.sh" This reverts commit 2de6eccb7f1c3d3a1821d1b41c6a3710d5a2b6ef. --- .ci/build_matrix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index 9f049203c4a..2b9396f2244 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -14,6 +14,7 @@ versions=( 'v25.1-ubuntu-cicd' 'v25.1-ubuntu-student' 'v24.2.0' + 'v24.2-ubuntu-cicd' 'v24.1.0' 'v24.1-ubuntu' 'v23.2.0' From 3ed692b389e0a59c048c447157ea40a44a5a23cf Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:24:08 +0100 Subject: [PATCH 27/29] fix: remove 'v24.2-ubuntu-cicd' from version list in build_matrix.sh --- .ci/build_matrix.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/build_matrix.sh b/.ci/build_matrix.sh index 2b9396f2244..9f049203c4a 100755 --- a/.ci/build_matrix.sh +++ b/.ci/build_matrix.sh @@ -14,7 +14,6 @@ versions=( 'v25.1-ubuntu-cicd' 'v25.1-ubuntu-student' 'v24.2.0' - 'v24.2-ubuntu-cicd' 'v24.1.0' 'v24.1-ubuntu' 'v23.2.0' From 622a2ced8c077029cbde40f8f14bd5c6f41e272e Mon Sep 17 00:00:00 2001 From: germa89 <28149841+germa89@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:42:03 +0100 Subject: [PATCH 28/29] fix: disable log uploads in CI for remote and local builds --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b1a88c6c1e..bf32145aecb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,7 +242,7 @@ jobs: with: mapdl-version: "${{ matrix.mapdl-version }}" file-name: "remote-${{ matrix.mapdl-version }}" - upload-logs: true + upload-logs: false build-test-local-matrix: name: "Build test matrix for minimal and local" @@ -292,7 +292,7 @@ jobs: tags: "local" latest-version: "252" test_dpf: ${{ contains(matrix.mapdl-version, 'cicd') && !contains(matrix.mapdl-version, '24') }} - upload-logs: true + upload-logs: false build-test-ubuntu-minimal: @@ -321,7 +321,7 @@ jobs: tags: "local,minimal" latest-version: "252" test_dpf: false - upload-logs: true + upload-logs: false build-test-ubuntu-console: @@ -351,7 +351,7 @@ jobs: file-name: "${{ matrix.mapdl-version }}-console" tags: "local,console" test_dpf: false - upload-logs: true + upload-logs: false package: name: "Package library" From f5eecfa29e7dcd979ce969c469769f109399e54f Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Wed, 26 Nov 2025 14:11:51 +0000 Subject: [PATCH 29/29] chore: adding changelog file 4319.fixed.md [dependabot-skip] --- doc/changelog.d/4319.fixed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.d/4319.fixed.md b/doc/changelog.d/4319.fixed.md index da490bb7c04..87f4caa5a30 100644 --- a/doc/changelog.d/4319.fixed.md +++ b/doc/changelog.d/4319.fixed.md @@ -1 +1 @@ -Cicd +Cicd mpi issue and adding conditional encrypted log uploads