From 1dbfdebcf5c6541b47dea06c922f98a078371711 Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Tue, 31 Jan 2023 12:11:09 +0100 Subject: [PATCH 1/4] Draft ci/cd --- .github/workflows/ci_cd.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 365cc4b9c..88804bfa6 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -55,12 +55,39 @@ 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 to Docker Hub + uses: docker/login-action@v2 + with: + registry: ghcr.io/ansys + username: pyansys-ci-bot + password: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} + + - name: Start services + run: | + 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 From 329ffd3e90c7b826217319fb245fc1b89fd118fe Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Tue, 31 Jan 2023 12:18:04 +0100 Subject: [PATCH 2/4] Add compose pull --- .github/workflows/ci_cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 88804bfa6..9bcdbe17d 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -76,6 +76,7 @@ jobs: - name: Start services run: | + docker-compose pull LOCALHOST_ADDR=localhost docker-compose up -d keycloak echo "Waiting a few sec ..." sleep 5 From b8e4c74ad5588b28561cee800b14160bdae8d553 Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Tue, 31 Jan 2023 12:21:56 +0100 Subject: [PATCH 3/4] Use package token --- .github/workflows/ci_cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 9bcdbe17d..ad28fc8d4 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -67,12 +67,12 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Login to Docker Hub - uses: docker/login-action@v2 + - name: Login in Github Container registry + uses: docker/login-action@v1 with: - registry: ghcr.io/ansys + registry: ghcr.io username: pyansys-ci-bot - password: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} + password: ${{ secrets.PYANSYS_CI_BOT_PACKAGE_TOKEN }} - name: Start services run: | From 5ed50613559aa459e81e3e02d4d9e698d06414fd Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Tue, 31 Jan 2023 13:54:00 +0100 Subject: [PATCH 4/4] Adjust operator monitoring --- ansys/rep/client/jms/api/jms_api.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)