Merge pull request #420 from adamtheturtle/DOUBLE-builds

Double builds

Author: adamtheturtle

CONTRIBUTING.md

@@ -94,23 +94,27 @@ The configuration for this is in `.travis.yml`.
 Travis CI is set up with secrets for connecting to Vuforia.
 These variables include those from `vuforia_secrets.env.example`.
 
-They also include another set of variables especially for running the tests on the `master` branch.
-The tests are run daily against the `master` branch.
-This means that when the daily request quota is used, the `master` branch may show as failing on the `README`.
-Using the request quota on the `master` branch also leaves fewer requests for regular development.
-Therefore, `master` is given its own Vuforia database with separate limits.
+To avoid hitting request quotas and to avoid conflicts when running multiple tests in prallel, we use multiple target databases.
+
+Travis builds use a different credentials file depending on the build number.
+For example, build 2045.1 will use a different credentials file to build 2045.2.
+This should avoid conflicts, but in theory the same credentials file may be run across two Pull Request builds.
+This may cause errors.
 
 ### How to set Travis CI secrets
 
 Create environment variable files for secrets:
 
 ```sh
 mkdir -p ci_secrets
-cp vuforia_secrets.env.example ci_secrets/vuforia_secrets_0.env
-cp vuforia_secrets.env.example ci_secrets/vuforia_secrets_master.env
+cp vuforia_secrets.env.example ci_secrets/vuforia_secrets_1.env
+cp vuforia_secrets.env.example ci_secrets/vuforia_secrets_2.env
+...
 ```
 
-Add Vuforia credentials to the file `ci_secrets/vuforia_secrets.env` and `ci_secrets/vuforia_secrets_master.env`.
+Add Vuforia credentials for different target databases to the new files in the `ci_secrets/` directory.
+Add as many credentials files as there are builds in the Travis matrix.
+All credentials files can share the same credentials for an inactive database.
 
 Install the Travis CLI:
 

ci/set_secrets_file.py

@@ -2,37 +2,20 @@
 Move the right secrets file into place for Travis CI.
 """
 
-import math
 import os
 import shutil
 from pathlib import Path
 
-CONCURRENT_BUILDS = 1
-
 
 def move_secrets_file() -> None:
     """
     Move the right secrets file to the current directory.
     """
-    branch = os.environ['TRAVIS_BRANCH']
-    is_pr = os.environ['TRAVIS_PULL_REQUEST'] != 'false'
-    is_master = branch == 'master'
-
+    travis_job_number = os.environ['TRAVIS_JOB_NUMBER']
+    travis_builder_number = travis_job_number.split('.')[-1]
     secrets_dir = Path('ci_secrets')
-
-    travis_build_number = float(os.environ['TRAVIS_BUILD_NUMBER'])
-    travis_job_number = float(os.environ['TRAVIS_JOB_NUMBER'])
-    travis_builder_number = math.ceil(
-        (travis_job_number - travis_build_number) * 10
-    )
-
-    if is_master and not is_pr:
-        suffix = 'master'
-    else:
-        suffix = str(travis_builder_number % CONCURRENT_BUILDS)
-
-    secrets_path = secrets_dir / f'vuforia_secrets_{suffix}.env'
-
+    secrets_path = secrets_dir / f'vuforia_secrets_{travis_builder_number}.env'
+    print(f'Using: {secrets_path}')
     shutil.copy(secrets_path, './vuforia_secrets.env')
 
 

secrets.tar.enc

@@ -295,13 +295,13 @@ def database_summary(vuforia_database_keys: VuforiaDatabaseKeys) -> Response:
     return response
 
 
-@timeout_decorator.timeout(seconds=120)
+@timeout_decorator.timeout(seconds=240)
 def wait_for_target_processed(
     vuforia_database_keys: VuforiaDatabaseKeys,
     target_id: str,
 ) -> None:
     """
-    Wait up to two minutes (arbitrary) for a target to get past the processing
+    Wait up to four minutes (arbitrary) for a target to get past the processing
     stage.
 
     Args: