diff --git a/docker/gitlab/patches/testing/New-Table-Migration.patch b/docker/gitlab/patches/testing/005-New-Table-Migration.patch similarity index 100% rename from docker/gitlab/patches/testing/New-Table-Migration.patch rename to docker/gitlab/patches/testing/005-New-Table-Migration.patch diff --git a/docker/gitlab/patches/testing/Drop-table-in-post-migration.patch b/docker/gitlab/patches/testing/010-Drop-table-in-post-migration.patch similarity index 100% rename from docker/gitlab/patches/testing/Drop-table-in-post-migration.patch rename to docker/gitlab/patches/testing/010-Drop-table-in-post-migration.patch diff --git a/docker/gitlab/patches/testing/Exception-Raised-in-Migration.patch b/docker/gitlab/patches/testing/015-Exception-Raised-in-Migration.patch similarity index 100% rename from docker/gitlab/patches/testing/Exception-Raised-in-Migration.patch rename to docker/gitlab/patches/testing/015-Exception-Raised-in-Migration.patch diff --git a/docker/gitlab/patches/testing/Add-a-migration-that-takes-five-seconds.patch b/docker/gitlab/patches/testing/020-Add-a-migration-that-takes-five-seconds.patch similarity index 100% rename from docker/gitlab/patches/testing/Add-a-migration-that-takes-five-seconds.patch rename to docker/gitlab/patches/testing/020-Add-a-migration-that-takes-five-seconds.patch diff --git a/docker/gitlab/patches/testing/Migration-inheriting-Gitlab-Database-Migration.patch b/docker/gitlab/patches/testing/025-Migration-inheriting-Gitlab-Database-Migration.patch similarity index 100% rename from docker/gitlab/patches/testing/Migration-inheriting-Gitlab-Database-Migration.patch rename to docker/gitlab/patches/testing/025-Migration-inheriting-Gitlab-Database-Migration.patch diff --git a/docker/gitlab/patches/testing/Migration-that-requires-Gitlab-com-true.patch b/docker/gitlab/patches/testing/030-Migration-that-requires-Gitlab-com-true.patch similarity index 100% rename from docker/gitlab/patches/testing/Migration-that-requires-Gitlab-com-true.patch rename to docker/gitlab/patches/testing/030-Migration-that-requires-Gitlab-com-true.patch diff --git a/docker/gitlab/patches/testing/Test-background-migrations.patch b/docker/gitlab/patches/testing/035-Test-background-migrations.patch similarity index 100% rename from docker/gitlab/patches/testing/Test-background-migrations.patch rename to docker/gitlab/patches/testing/035-Test-background-migrations.patch diff --git a/docker/gitlab/patches/testing/apply.sh b/docker/gitlab/patches/testing/apply.sh new file mode 100755 index 0000000000000000000000000000000000000000..2ab82ebb64645d23565c2f40c144bb1ed5497a14 --- /dev/null +++ b/docker/gitlab/patches/testing/apply.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +for PATCH in /gitlab/patches/testing/*.patch; do + echo "Applying patch file ${PATCH}" + git am < $PATCH +done diff --git a/docker/gitlab/prepare.sh b/docker/gitlab/prepare.sh index 94d8e2bb1bc86cacf8f2eb24cbe66dfb6bc24131..1d92d4fe85a1dd4a6988a895a4e9a3cd26a6404a 100755 --- a/docker/gitlab/prepare.sh +++ b/docker/gitlab/prepare.sh @@ -30,14 +30,8 @@ test: &test EOF if test "$VALIDATION_PIPELINE"; then - echo "Applying test patch" - git am < /gitlab/patches/testing/New-Table-Migration.patch - git am < /gitlab/patches/testing/Drop-table-in-post-migration.patch - git am < /gitlab/patches/testing/Exception-Raised-in-Migration.patch - git am < /gitlab/patches/testing/Add-a-migration-that-takes-five-seconds.patch - git am < /gitlab/patches/testing/Migration-inheriting-Gitlab-Database-Migration.patch - git am < /gitlab/patches/testing/Migration-that-requires-Gitlab-com-true.patch - git am < /gitlab/patches/testing/Test-background-migrations.patch + echo "Applying test patches" + /gitlab/patches/testing/apply.sh fi ### REDIS