From 964c44bfd0bb9736911d2ae5756a1c75cd99d1fc Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Wed, 3 Jul 2019 20:07:19 +0500 Subject: [PATCH 1/9] Added stage of benchmarking --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index e9f71e4dc..904ef839b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,4 +48,15 @@ jobs: - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd script: - "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-sdk-compat.sh" + - stage: 'Benchmarking tests' + merge_mode: replace + env: SDK=java + cache: false + language: minimal + before_install: skip + install: skip + before_script: + - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd + script: + - "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-benchmark-suite.sh" after_success: travis_terminate 0 From 3458bc3f141ffddc54ff2c42332f4076e469a9ef Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Mon, 8 Jul 2019 20:05:49 +0500 Subject: [PATCH 2/9] updated adding benchmarking stage --- .travis.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 904ef839b..4632df216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,12 +32,14 @@ after_failure: # Integration tests need to run first to reset the PR build status to pending stages: - - 'Integration tests' + - 'Integration Tests' + - 'Benchmarking Tests' - 'Test' jobs: include: - - stage: 'Integration tests' + - &integrationtest + stage: 'Integration tests' merge_mode: replace env: SDK=java cache: false @@ -45,18 +47,10 @@ jobs: before_install: skip install: skip before_script: - - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd + - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git sohail/refactorscript && popd script: - - "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-sdk-compat.sh" - - stage: 'Benchmarking tests' - merge_mode: replace - env: SDK=java - cache: false - language: minimal - before_install: skip - install: skip - before_script: - - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd - script: - - "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-benchmark-suite.sh" + - "$HOME/travisci-tools/trigger-script-with-status-update.sh" after_success: travis_terminate 0 + - <<: *integrationtest + stage: 'Benchmarking Tests' + env: SDK=java REPO_SLUG=Benchmarking From d903ff5742f334ca0205441ee2557b9eacf2ee32 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Mon, 8 Jul 2019 20:07:59 +0500 Subject: [PATCH 3/9] nit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4632df216..066679ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ after_failure: # Integration tests need to run first to reset the PR build status to pending stages: - - 'Integration Tests' - - 'Benchmarking Tests' + - 'Integration tests' + - 'Benchmarking tests' - 'Test' jobs: From e42d9e3eef3855bcc94139c3954b623bb790df68 Mon Sep 17 00:00:00 2001 From: yasirfolio3 <39988750+yasirfolio3@users.noreply.github.com> Date: Thu, 18 Jul 2019 10:41:56 +0500 Subject: [PATCH 4/9] changed REPO_SLUG to FULLSTACK_TEST_REPO --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 066679ef2..f2209c6c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,4 +53,4 @@ jobs: after_success: travis_terminate 0 - <<: *integrationtest stage: 'Benchmarking Tests' - env: SDK=java REPO_SLUG=Benchmarking + env: SDK=java FULLSTACK_TEST_REPO=Benchmarking From d01bc170dbeb775c7f1747de5c1990d0a0da314a Mon Sep 17 00:00:00 2001 From: yasirfolio3 <39988750+yasirfolio3@users.noreply.github.com> Date: Thu, 18 Jul 2019 10:50:01 +0500 Subject: [PATCH 5/9] Script for benchmarking updated. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f2209c6c1..763e77fd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,5 +52,7 @@ jobs: - "$HOME/travisci-tools/trigger-script-with-status-update.sh" after_success: travis_terminate 0 - <<: *integrationtest - stage: 'Benchmarking Tests' + stage: 'Benchmarking tests' env: SDK=java FULLSTACK_TEST_REPO=Benchmarking + script: + - "$HOME/travisci-tools/trigger-script-with-status-update.sh yasir/bench-exp-support" From aaa546b519a9ceeb2df4e06270ce6223535659d9 Mon Sep 17 00:00:00 2001 From: yasirfolio3 <39988750+yasirfolio3@users.noreply.github.com> Date: Thu, 18 Jul 2019 11:23:46 +0500 Subject: [PATCH 6/9] Removing custom branch. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 763e77fd8..099e13410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ jobs: before_install: skip install: skip before_script: - - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git sohail/refactorscript && popd + - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd script: - "$HOME/travisci-tools/trigger-script-with-status-update.sh" after_success: travis_terminate 0 From 5857179ef7bd6da1701a4243147a73400ce1bad4 Mon Sep 17 00:00:00 2001 From: yasirfolio3 <39988750+yasirfolio3@users.noreply.github.com> Date: Fri, 19 Jul 2019 10:41:03 +0500 Subject: [PATCH 7/9] Removed custom branch. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 099e13410..41f3e5532 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,5 +54,3 @@ jobs: - <<: *integrationtest stage: 'Benchmarking tests' env: SDK=java FULLSTACK_TEST_REPO=Benchmarking - script: - - "$HOME/travisci-tools/trigger-script-with-status-update.sh yasir/bench-exp-support" From c036f0139e4b4613399e1b74ab56cd43ca14be05 Mon Sep 17 00:00:00 2001 From: yasirfolio3 <39988750+yasirfolio3@users.noreply.github.com> Date: Fri, 19 Jul 2019 10:43:23 +0500 Subject: [PATCH 8/9] nit updates. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41f3e5532..c58659495 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ jobs: before_script: - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd script: - - "$HOME/travisci-tools/trigger-script-with-status-update.sh" + - $HOME/travisci-tools/trigger-script-with-status-update.sh after_success: travis_terminate 0 - <<: *integrationtest stage: 'Benchmarking tests' From d9a7b441d7c3a16620b1b3f438d0e37709a5065f Mon Sep 17 00:00:00 2001 From: msohailhussain Date: Thu, 25 Jul 2019 13:57:56 -0700 Subject: [PATCH 9/9] pass branch to FSC --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdf29fb22..3fd16be69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ jobs: - &integrationtest stage: 'Integration tests' merge_mode: replace - env: SDK=java + env: SDK=java SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH cache: false language: minimal before_install: skip @@ -58,4 +58,4 @@ jobs: after_success: travis_terminate 0 - <<: *integrationtest stage: 'Benchmarking tests' - env: SDK=java FULLSTACK_TEST_REPO=Benchmarking + env: SDK=java FULLSTACK_TEST_REPO=Benchmarking SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH