diff --git a/.github/workflows/e2e-preset-test.yml b/.github/workflows/e2e-preset-test.yml index 8bc445d86..ae89e8a19 100644 --- a/.github/workflows/e2e-preset-test.yml +++ b/.github/workflows/e2e-preset-test.yml @@ -2,8 +2,9 @@ name: E2E Preset Test on: workflow_run: - workflows: ["Build and Push Preset Models"] - types: [completed] + workflows: [Build and Push Preset Models] + types: + - completed workflow_dispatch: {} env: diff --git a/.github/workflows/preset-image-build.yml b/.github/workflows/preset-image-build.yml index 0f6fd5dd9..24a1d24ce 100644 --- a/.github/workflows/preset-image-build.yml +++ b/.github/workflows/preset-image-build.yml @@ -214,23 +214,23 @@ jobs: - name: 'Login to ACR' run: az acr login --name aimodelsregistry - - name: Build and push model (with retries) - run: | - retries=3 - while [ $retries -gt 0 ]; do - BUILD_ARGS="${{ matrix.model.build_args }}" - BUILD_ARGS=${BUILD_ARGS/__EXTERNAL_IP__/${{ secrets.AZURE_WEB_SERVER_EXTERNAL_IP }}} - BUILD_ARGS=${BUILD_ARGS/__EXTERNAL_PORT__/${{ secrets.AZURE_WEB_SERVER_EXTERNAL_PORT }}} - BUILD_ARGS=${BUILD_ARGS/__WEB_SERVER_AUTH_TOKEN__/${{ secrets.WEB_SERVER_AUTH_TOKEN }}} - - echo "Docker BUILD_ARGS: $BUILD_ARGS" - - az acr build \ - $BUILD_ARGS \ - -t aimodelsregistry.azurecr.io/${{ matrix.model.name }}:${{ needs.setup.outputs.image_tag }} \ - -r aimodelsregistry \ - -f ${{ matrix.model.dockerfile }} \ - . && break - retries=$((retries-1)) - sleep 15 - done + # - name: Build and push model (with retries) + # run: | + # retries=3 + # while [ $retries -gt 0 ]; do + # BUILD_ARGS="${{ matrix.model.build_args }}" + # BUILD_ARGS=${BUILD_ARGS/__EXTERNAL_IP__/${{ secrets.AZURE_WEB_SERVER_EXTERNAL_IP }}} + # BUILD_ARGS=${BUILD_ARGS/__EXTERNAL_PORT__/${{ secrets.AZURE_WEB_SERVER_EXTERNAL_PORT }}} + # BUILD_ARGS=${BUILD_ARGS/__WEB_SERVER_AUTH_TOKEN__/${{ secrets.WEB_SERVER_AUTH_TOKEN }}} + + # echo "Docker BUILD_ARGS: $BUILD_ARGS" + + # az acr build \ + # $BUILD_ARGS \ + # -t aimodelsregistry.azurecr.io/${{ matrix.model.name }}:${{ needs.setup.outputs.image_tag }} \ + # -r aimodelsregistry \ + # -f ${{ matrix.model.dockerfile }} \ + # . && break + # retries=$((retries-1)) + # sleep 15 + # done