From bd537a2a4e6e0c751e0e435cf69760eb5e58c509 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 3 Jul 2020 10:26:01 +0300 Subject: [PATCH] test on current branch (this will be reverted before merge) --- .circleci/config.yml | 4 ++-- azure/create-cluster.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b2be122..38628964 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,7 +140,7 @@ workflows: filters: branches: only: - - master + - valgrind-merge jobs: - valgrind-test @@ -152,6 +152,6 @@ workflows: filters: branches: only: - - master + - valgrind-merge jobs: - finalize-valgrind-test diff --git a/azure/create-cluster.sh b/azure/create-cluster.sh index 72365c09..bacfb1ba 100755 --- a/azure/create-cluster.sh +++ b/azure/create-cluster.sh @@ -32,7 +32,7 @@ echo "waiting a long time to create cluster, this might take up to 30 mins depen # store the branch name in a file so that target user can read it. Target user cannot see the envionment variables because # we use login option in su and -p(preserving environment variables) cannot be used with login. We need to use login option # so that $HOME, $PATH are set to the target users $HOME and $PATH. -export BRANCH=${CIRCLE_BRANCH:=master} +export BRANCH="valgrind-merge" # below is the default create cluster command CREATE_CLUSTER_COMMAND=(az group deployment create -g ${rg} --template-file azuredeploy.json --parameters @azuredeploy.parameters.json --parameters sshPublicKey="${public_key}" branchName="$BRANCH")