From 2b8f19aadf1954cab90f6ecdcf00790e76d5a395 Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Fri, 24 Aug 2018 12:45:22 -0500 Subject: [PATCH] different branch names for better race condition resiliance Background: sometimes projects are not fully deleted yet and are already used by the next build so they are basically still used while also deleted --- tests/tests/features.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tests/features.yaml b/tests/tests/features.yaml index 3b86969136..39001ec5f9 100644 --- a/tests/tests/features.yaml +++ b/tests/tests/features.yaml @@ -53,7 +53,7 @@ testname: "ENVIRONMENT TYPE DEVELOPMENT" git_repo_name: features.git project: ci-features - branch: develop + branch: environment-type environment_type: development check_url: "http://node.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ lookup('env','OPENSHIFT_ROUTE_SUFFIX') }}" @@ -62,7 +62,7 @@ testname: "CUSTOM DEPLOYMENT TEMPLATES docker-compose" git_repo_name: features.git project: ci-features - branch: develop + branch: branch/custom-template expected_template_filename: .lagoon.node.yml check_url: "http://node.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ lookup('env','OPENSHIFT_ROUTE_SUFFIX') }}" @@ -115,5 +115,5 @@ testname: "SUBFOLDER" git_repo_name: features-subfolder.git project: ci-features-subfolder - branch: branch1 + branch: subfolder check_url: "http://node.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ lookup('env','OPENSHIFT_ROUTE_SUFFIX') }}" \ No newline at end of file