[skip ci]merge conflicts

tests/integration-test.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
-<<<<<<< HEAD
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-=======
 # Copyright 2016-2018 VMware, Inc. All Rights Reserved.
->>>>>>> origin/master
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +22,6 @@ dpkg -l > package.list
 
 
 buildinfo=$(drone build info vmware/vic $DRONE_BUILD_NUMBER)
-<<<<<<< HEAD
 prNumber=$(drone build info --format "{{ .Ref }}" vmware/vic $DRONE_BUILD_NUMBER | cut -f 3 -d'/')
 prBody=$(curl https://api.github.com/repos/vmware/vic/pulls/$prNumber | jq -r ".body")
 
@@ -35,30 +30,19 @@ if (echo $prBody | grep -q "\[fast fail\]"); then
 else
     export FAST_FAILURE=0
 fi
-=======
->>>>>>> origin/master
 
 if [[ $DRONE_BRANCH == "master" || $DRONE_BRANCH == "releases/"* ]] && [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "push" ]]; then
     echo "Running full CI for $DRONE_BUILD_EVENT on $DRONE_BRANCH"
     pybot --removekeywords TAG:secret --exclude skip tests/test-cases
 elif [[ $DRONE_BRANCH == *"refs/tags"* ]] && [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "tag" ]]; then
     echo "Running only Group11-Upgrade and 7-01-Regression for $DRONE_BUILD_EVENT on $DRONE_BRANCH"
     pybot --removekeywords TAG:secret --suite Group11-Upgrade --suite 7-01-Regression tests/test-cases
-<<<<<<< HEAD
 elif (echo $prBody | grep -q "\[full ci\]"); then
     echo "Running full CI as per commit message"
     pybot --removekeywords TAG:secret --exclude skip tests/test-cases
 elif (echo $prBody | grep -q "\[specific ci="); then
     echo "Running specific CI as per commit message"
     buildtype=$(echo $prBody | grep "\[specific ci=")
-=======
-elif grep -q "\[full ci\]" <(drone build info vmware/vic $DRONE_BUILD_NUMBER); then
-    echo "Running full CI as per commit message"
-    pybot --removekeywords TAG:secret --exclude skip tests/test-cases
-elif (echo $buildinfo | grep -q "\[specific ci="); then
-    echo "Running specific CI as per commit message"
-    buildtype=$(echo $buildinfo | grep "\[specific ci=")
->>>>>>> origin/master
     testsuite=$(echo $buildtype | awk -F"\[specific ci=" '{sub(/\].*/,"",$2);print $2}')
     pybot --removekeywords TAG:secret --suite $testsuite --suite 7-01-Regression tests/test-cases
 else
@@ -71,11 +55,7 @@ rc="$?"
 timestamp=$(date +%s)
 outfile="integration_logs_"$DRONE_BUILD_NUMBER"_"$DRONE_COMMIT".zip"
 
-<<<<<<< HEAD
-zip -9 $outfile output.xml log.html report.html package.list *container-logs.zip *.log
-=======
 zip -9 -j $outfile output.xml log.html report.html package.list *container-logs*.zip *.log /var/log/vic-machine-server/vic-machine-server.log
->>>>>>> origin/master
 
 # GC credentials
 keyfile="/root/vic-ci-logs.key"