From 8b23a9338db0c30a617b77be50c8a49753c620e8 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Mon, 12 Jul 2021 22:47:08 +0800 Subject: [PATCH] Update pytest image version (#6457) Signed-off-by: quicksilver --- .github/workflows/publish-builder.yaml | 3 ++- .github/workflows/publish-test-images.yaml | 9 ++++++++- tests/docker/.env | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-builder.yaml b/.github/workflows/publish-builder.yaml index 5873e9e30..f595adc7c 100644 --- a/.github/workflows/publish-builder.yaml +++ b/.github/workflows/publish-builder.yaml @@ -27,6 +27,7 @@ jobs: os: [ubuntu18.04, centos7] env: OS_NAME: ${{ matrix.os }} + GITHUB_TOKEN: ${{ secrets.ALL_CONTRIBUTORS_TOKEN }} steps: - name: Checkout uses: actions/checkout@v2 @@ -66,4 +67,4 @@ jobs: continue-on-error: true shell: bash run: | - git push "https://${{ secrets.ALL_CONTRIBUTORS_TOKEN }}@github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags + git push "https://github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags diff --git a/.github/workflows/publish-test-images.yaml b/.github/workflows/publish-test-images.yaml index 80d85ba12..ccf220dd2 100644 --- a/.github/workflows/publish-test-images.yaml +++ b/.github/workflows/publish-test-images.yaml @@ -23,6 +23,8 @@ jobs: name: PyTest runs-on: ubuntu-latest timeout-minutes: 60 + env: + GITHUB_TOKEN: ${{ secrets.ALL_CONTRIBUTORS_TOKEN }} steps: - name: Checkout uses: actions/checkout@v2 @@ -31,6 +33,11 @@ jobs: run: | echo "::set-output name=version::$(date +%Y%m%d)" echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + - name: Docker Pull + shell: bash + working-directory: tests/docker + run: | + IMAGE_TAG=latest docker-compose pull --ignore-pull-failures pytest - name: Docker Build shell: bash working-directory: tests/docker @@ -65,4 +72,4 @@ jobs: continue-on-error: true shell: bash run: | - git push "https://${{ secrets.ALL_CONTRIBUTORS_TOKEN }}@github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags + git push "https://github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags diff --git a/tests/docker/.env b/tests/docker/.env index e55d60fe1..3ac71d7b6 100644 --- a/tests/docker/.env +++ b/tests/docker/.env @@ -3,4 +3,4 @@ MILVUS_SERVICE_PORT=19530 MILVUS_PYTEST_WORKSPACE=/milvus/tests/python_test MILVUS_PYTEST_LOG_PATH=/milvus/_artifacts/tests/pytest_logs IMAGE_REPO=milvusdb -IMAGE_TAG=latest \ No newline at end of file +IMAGE_TAG=20210712-db23ad8 -- GitLab