diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 365cc4b9c..ad28fc8d4 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -55,12 +55,40 @@ jobs: run: | python -m pip install --upgrade pip setuptools tox tox-gh-actions + - name: Check out rep-deployments + uses: actions/checkout@v3 + with: + repository: ansys/rep-deployments + token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} + submodules: true + path: rep-deployments + + - uses: KengoTODA/actions-setup-docker-compose@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Login in Github Container registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: pyansys-ci-bot + password: ${{ secrets.PYANSYS_CI_BOT_PACKAGE_TOKEN }} + + - name: Start services + run: | + docker-compose pull + LOCALHOST_ADDR=localhost docker-compose up -d keycloak + echo "Waiting a few sec ..." + sleep 5 + LOCALHOST_ADDR=localhost docker-compose up -d + working-directory: ./rep-deployments/docker-compose + - name: Test with tox run: tox -e ${{ matrix.cfg.toxenv }}-noeval-coverage env: - REP_TEST_URL: https://repkube.westeurope.cloudapp.azure.com/dev/rep + REP_TEST_URL: https://localhost:8443/rep REP_TEST_USERNAME: repadmin - REP_TEST_PASSWORD: ${{ secrets.REPADMIN_PASSWORD }} + REP_TEST_PASSWORD: repadmin - name: Publish Test Report uses: mikepenz/action-junit-report@v3 diff --git a/ansys/rep/client/jms/api/jms_api.py b/ansys/rep/client/jms/api/jms_api.py index a1c6bdd21..6088604aa 100644 --- a/ansys/rep/client/jms/api/jms_api.py +++ b/ansys/rep/client/jms/api/jms_api.py @@ -290,8 +290,11 @@ def _monitor_operation(jms_api: JmsApi, operation_id: str, interval: float = 1.0 op = jms_api.get_operation(id=operation_id) if op: done = op.finished + progress = None + if op.progress is not None: + progress = f"{op.progress * 100.0}%" log.info( - f"Operation {op.name} - progress={op.progress * 100.0}%, " + f"Operation {op.name} - progress={progress}, " f"succeeded={op.succeeded}, finished={op.finished}" ) time.sleep(interval)