From 02986b4eaa33333a3a6c2891c92b850bb00c6426 Mon Sep 17 00:00:00 2001 From: IlyaFaer Date: Thu, 18 Mar 2021 10:48:59 +0300 Subject: [PATCH 1/2] re-run tests --- .kokoro/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 186738151e..0970ff2dd2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -28,7 +28,6 @@ export GOOGLE_CLOUD_PROJECT=$(cat "${KOKORO_GFILE_DIR}/project-id.json") # Remove old nox python3.6 -m pip uninstall --yes --quiet nox-automation -# Install nox python3.6 -m pip install --upgrade --quiet nox python3.6 -m nox --version From d043ee6141eddb43e47e4e9318c583d74767ebbb Mon Sep 17 00:00:00 2001 From: IlyaFaer Date: Mon, 22 Mar 2021 13:01:40 +0300 Subject: [PATCH 2/2] Use special branch --- .kokoro/build.sh | 1 + django_test_suite.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0970ff2dd2..16de9bf2f5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -42,6 +42,7 @@ fi export RUNNING_SPANNER_BACKEND_TESTS=1 pip3 install . +pip3 install -e 'git+https://github.com/q-logic/python-spanner.git@revert_233#egg=django-google-spanner' export DJANGO_TESTS_DIR="django_tests_dir" mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch "spanner/stable/2.2.x" https://github.com/c24t/django.git $DJANGO_TESTS_DIR/django diff --git a/django_test_suite.sh b/django_test_suite.sh index 8380bb24e3..15ce5e500d 100755 --- a/django_test_suite.sh +++ b/django_test_suite.sh @@ -18,6 +18,7 @@ mkdir -p $DJANGO_TESTS_DIR if [ $SPANNER_EMULATOR_HOST != 0 ] then pip3 install . + pip3 install -e 'git+https://github.com/q-logic/python-spanner.git@revert_233#egg=django-google-spanner' git clone --depth 1 --single-branch --branch "spanner/stable/2.2.x" https://github.com/c24t/django.git $DJANGO_TESTS_DIR/django fi