diff --git a/.circleci/config.yml b/.circleci/config.yml index ce2bfdf6..b8401089 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -141,7 +141,7 @@ workflows: filters: branches: only: - - master + - valgrind-merge jobs: - valgrind-test @@ -155,6 +155,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 d9d93721..ea6d9410 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")