From 0e123c783b30f3f3e08b378daa0830e9ad59f6ea Mon Sep 17 00:00:00 2001 From: Jimmy Xu Date: Fri, 5 Jan 2018 12:32:03 +0000 Subject: [PATCH] [fix-hyper-vendor] update hypercli in vendor --- Gopkg.toml | 4 + .../github.com/hyperhq/hypercli/.dockerignore | 3 + vendor/github.com/hyperhq/hypercli/.gitignore | 42 +++ vendor/github.com/hyperhq/hypercli/.mailmap | 171 +++++++++++ .../hyperhq/hypercli/api/client/trust.go | 6 +- .../hyperhq/hypercli/hack/update-gofmt.sh | 2 + .../hypercli/integration-cli/README.md | 0 .../integration-cli/autotest/Dockerfile | 82 +++++ .../integration-cli/autotest/entrypoint.sh | 3 + .../integration-cli/autotest/etc/.gitignore | 1 + .../autotest/etc/config.template | 17 ++ .../integration-cli/autotest/script/run.sh | 279 ++++++++++++++++++ .../integration-cli/autotest/script/slack.sh | 28 ++ .../hypercli/integration-cli/autotest/util.sh | 91 ++++++ .../integration-cli/hyper_api_stats_test.go | 0 .../integration-cli/hyper_cli_config_test.go | 0 .../integration-cli/hyper_cli_links_test.go | 0 .../hyper_cli_load_local_test.go | 0 .../integration-cli/hyper_cli_login_test.go | 0 .../integration-cli/hyper_cli_run_test.go | 0 .../hyper_cli_run_unix_test.go | 0 21 files changed, 726 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/hyperhq/hypercli/.dockerignore create mode 100644 vendor/github.com/hyperhq/hypercli/.gitignore create mode 100644 vendor/github.com/hyperhq/hypercli/.mailmap mode change 100644 => 100755 vendor/github.com/hyperhq/hypercli/api/client/trust.go create mode 100755 vendor/github.com/hyperhq/hypercli/hack/update-gofmt.sh mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/README.md create mode 100644 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/Dockerfile create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/entrypoint.sh create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/.gitignore create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/config.template create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/script/run.sh create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/script/slack.sh create mode 100755 vendor/github.com/hyperhq/hypercli/integration-cli/autotest/util.sh mode change 100644 => 100755 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_api_stats_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_config_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_links_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_load_local_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_login_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_test.go mode change 100755 => 100644 vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_unix_test.go diff --git a/Gopkg.toml b/Gopkg.toml index ec25a3350..08e2df9c9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -52,3 +52,7 @@ [[constraint]] name = "github.com/gorilla/mux" version = "1.6.0" + +[[constraint]] + name = "github.com/hyperhq/hypercli" + revision = "3e4e4fa373cbf8672bded67688b4821cd30b37f9" diff --git a/vendor/github.com/hyperhq/hypercli/.dockerignore b/vendor/github.com/hyperhq/hypercli/.dockerignore new file mode 100644 index 000000000..9bd2c0219 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/.dockerignore @@ -0,0 +1,3 @@ +bundles +.gopath +vendor/pkg diff --git a/vendor/github.com/hyperhq/hypercli/.gitignore b/vendor/github.com/hyperhq/hypercli/.gitignore new file mode 100644 index 000000000..2e28fb7c4 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/.gitignore @@ -0,0 +1,42 @@ +# Docker project generated files to ignore +# if you want to ignore files created by your editor/tools, +# please consider a global .gitignore https://help.github.com/articles/ignoring-files +*.exe +*.exe~ +*.orig +*.test +.*.swp +.DS_Store +.bashrc +.dotcloud +.flymake* +.git/ +.gopath/ +.hg/ +.vagrant* +Vagrantfile +a.out +autogen/ +bin +build_src +bundles/ +docker/docker +hyper/hyper +dockerversion/version_autogen.go +docs/AWS_S3_BUCKET +docs/GITCOMMIT +docs/GIT_BRANCH +docs/VERSION +docs/_build +docs/_static +docs/_templates +docs/changed-files +# generated by man/md2man-all.sh +man/man1 +man/man5 +man/man8 +pyenv +vendor/pkg/ +*.yml +.idea +integration-cli/util.conf diff --git a/vendor/github.com/hyperhq/hypercli/.mailmap b/vendor/github.com/hyperhq/hypercli/.mailmap new file mode 100644 index 000000000..8348b4a81 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/.mailmap @@ -0,0 +1,171 @@ +# Generate AUTHORS: hack/generate-authors.sh + +# Tip for finding duplicates (besides scanning the output of AUTHORS for name +# duplicates that aren't also email duplicates): scan the output of: +# git log --format='%aE - %aN' | sort -uf +# +# For explanation on this file format: man git-shortlog + +Patrick Stapleton +Shishir Mahajan +Erwin van der Koogh +Ahmed Kamal +Tejesh Mehta +Cristian Staretu +Cristian Staretu +Cristian Staretu +Marcus Linke +Aleksandrs Fadins +Christopher Latham +Hu Keping +Wayne Chang +Chen Chao +Daehyeok Mun + + + + + + +Guillaume J. Charmes + + + + + +Thatcher Peskens +Thatcher Peskens +Thatcher Peskens dhrp +Jérôme Petazzoni jpetazzo +Jérôme Petazzoni +Joffrey F +Joffrey F +Joffrey F +Tim Terhorst +Andy Smith + + + + + + + + + +Walter Stanish + +Roberto Hashioka +Konstantin Pelykh +David Sissitka +Nolan Darilek + +Benoit Chesneau +Jordan Arentsen +Daniel Garcia +Miguel Angel Fernández +Bhiraj Butala +Faiz Khan +Victor Lyuboslavsky +Jean-Baptiste Barth +Matthew Mueller + +Shih-Yuan Lee +Daniel Mizyrycki root +Jean-Baptiste Dalido + + + + + + + + + + + + + + +Sven Dowideit +Sven Dowideit +Sven Dowideit +Sven Dowideit <¨SvenDowideit@home.org.au¨> +Sven Dowideit +Sven Dowideit + +Alexandr Morozov + +O.S. Tezer + +Roberto G. Hashioka + + + + + +Sridhar Ratnakumar +Sridhar Ratnakumar +Liang-Chi Hsieh +Aleksa Sarai +Will Weaver +Timothy Hobbs +Nathan LeClaire +Nathan LeClaire + + + + +Matthew Heon + + + +Francisco Carriedo + + + + + +Brian Goff + + + +Hollie Teal + + + +Jessica Frazelle Jessie Frazelle + + + + + +Thomas LEVEIL Thomas LÉVEIL + + +Antonio Murdaca +Antonio Murdaca +Antonio Murdaca +Darren Shepherd +Deshi Xiao +Deshi Xiao +Doug Davis +Jacob Atzen +Jeff Nickoloff + +John Howard (VM) John Howard +Madhu Venugopal +Mary Anthony +Mary Anthony moxiegirl +Mary Anthony +mattyw +resouer +AJ Bowen soulshake +AJ Bowen soulshake +Tibor Vass +Tibor Vass +Vincent Bernat +Yestin Sun +bin liu +John Howard (VM) jhowardmsft +Ankush Agarwal +Tangi COLIN tangicolin diff --git a/vendor/github.com/hyperhq/hypercli/api/client/trust.go b/vendor/github.com/hyperhq/hypercli/api/client/trust.go old mode 100644 new mode 100755 index 710ef8869..0789b8acb --- a/vendor/github.com/hyperhq/hypercli/api/client/trust.go +++ b/vendor/github.com/hyperhq/hypercli/api/client/trust.go @@ -114,7 +114,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut return nil, err } - var cfg = tlsconfig.ClientDefault + var cfg = tlsconfig.ClientDefault() cfg.InsecureSkipVerify = !repoInfo.Index.Secure // Get certificate base directory @@ -124,7 +124,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut } logrus.Debugf("reading certificate directory: %s", certDir) - if err := registry.ReadCertsDirectory(&cfg, certDir); err != nil { + if err := registry.ReadCertsDirectory(cfg, certDir); err != nil { return nil, err } @@ -136,7 +136,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut DualStack: true, }).Dial, TLSHandshakeTimeout: 10 * time.Second, - TLSClientConfig: &cfg, + TLSClientConfig: cfg, DisableKeepAlives: true, } diff --git a/vendor/github.com/hyperhq/hypercli/hack/update-gofmt.sh b/vendor/github.com/hyperhq/hypercli/hack/update-gofmt.sh new file mode 100755 index 000000000..db32a17e3 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/hack/update-gofmt.sh @@ -0,0 +1,2 @@ +#!/bin/bash +find . -name "*.go" | grep -v Godeps |grep -v vendor | xargs gofmt -s -w diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/README.md b/vendor/github.com/hyperhq/hypercli/integration-cli/README.md old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/Dockerfile b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/Dockerfile new file mode 100644 index 000000000..980dbb1a4 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/Dockerfile @@ -0,0 +1,82 @@ +FROM centos:7.3.1611 + +#This Dockerfile is used for autotest hypercli +#REF: integration-cli/README.md + +################################### +## install common package ## +################################### +RUN yum install -y\ + automake \ + autoconf \ + make \ + gcc \ + wget \ + time \ + git \ + which \ + screen &&\ + yum clean all + + +######################################## +## prepare java run env ## +######################################## +RUN wget --no-check-certificate --no-cookies \ + --header "Cookie: oraclelicense=accept-securebackup-cookie" \ + http://download.oracle.com/otn-pub/java/jdk/8u141-b15/336fa29ff2bb4ef291e347e091f7f4a7/jdk-8u141-linux-x64.rpm \ + && rpm -ivh jdk-8u141-linux-x64.rpm && rm -rf jdk-8u141-linux-x64.rpm + +ENV JAVA_HOME /usr/java/jdk1.8.0_141 +ENV PATH $PATH:$JAVA_HOME/bin + + +########################### +## install golang ## +########################### +ENV GO_VERSION 1.8.3 +RUN wget http://golangtc.com/static/go/${GO_VERSION}/go${GO_VERSION}.linux-amd64.tar.gz +RUN tar -xzf go${GO_VERSION}.linux-amd64.tar.gz -C /usr/local +ENV GOROOT /usr/local/go +ENV PATH $GOROOT/bin:$PATH + + +########################################## +## prepare jenkins slave run env ## +########################################## +ENV HOME /home/jenkins +RUN groupadd -g 10000 jenkins +RUN useradd -c "Jenkins user" -d $HOME -u 10000 -g 10000 -m jenkins +RUN mkdir /home/jenkins/.tmp +VOLUME ["/home/jenkins"] + +WORKDIR $HOME +USER root + +################################ +## prepare for build env ## +################################ +## Env +ENV PATH /go/bin:/usr/local/go/bin:/usr/bin:/usr/local/bin:$PATH +ENV GOPATH /go:/go/src/github.com/hyperhq/hypercli/integration-cli/vendor:/go/src/github.com/hyperhq/hypercli/vendor + +#TARGET_REGION could be: us-west-1|eu-central-1|RegionOne +ENV TARGET_REGION=${TARGET_REGION:-us-west-1} +ENV BRANCH=${BRANCH:-master} +ENV TEST_CASE_REG=${TEST_CASE_REG:-TestCli.*} + +## hyper account for test +ENV ACCESS_KEY= +ENV SECRET_KEY= + +## slack parameter +ENV SLACK_TOKEN= +ENV SLACK_CHANNEL_ID= + + +COPY entrypoint.sh /usr/local/bin/entrypoint.sh +COPY script/slack.sh /usr/local/bin/slack.sh +COPY script/run.sh /usr/local/bin/run.sh + +ENTRYPOINT ["entrypoint.sh"] +CMD ["run.sh"] \ No newline at end of file diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/entrypoint.sh b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/entrypoint.sh new file mode 100755 index 000000000..5fc44481d --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +exec "$@" diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/.gitignore b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/.gitignore new file mode 100755 index 000000000..30fa1ceaf --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/.gitignore @@ -0,0 +1 @@ +config \ No newline at end of file diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/config.template b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/config.template new file mode 100755 index 000000000..e5ef69453 --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/etc/config.template @@ -0,0 +1,17 @@ +TARGET_REGION="us-west-1" +BRANCH="master" +TEST_CASE_REG="TestCli.*Basic" +TIMEOUT="90m" + +# hyper credentrial for test +ACCESS_KEY="" +SECRET_KEY="" + +################################ +# slack token +# https://api.slack.com/methods/workspace-tokens +# https://api.slack.com/docs/token-types +# https://api.slack.com/custom-integrations/legacy-tokens +################################ +SLACK_TOKEN="xoxp-xxxxxxxxxxx" +SLACK_CHANNEL_ID="C7AB6M1NJ" #hykins-monitor \ No newline at end of file diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/script/run.sh b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/script/run.sh new file mode 100755 index 000000000..37026bbdc --- /dev/null +++ b/vendor/github.com/hyperhq/hypercli/integration-cli/autotest/script/run.sh @@ -0,0 +1,279 @@ +#!/bin/bash + +export HYPER_CONFIG=~/.hyper +export DOCKER_REMOTE_DAEMON=1 +export DOCKER_CERT_PATH=fixtures/hyper_ssl +export DOCKER_TLS_VERIFY= + +#check hyper credentrial +if [[ "${ACCESS_KEY}" == "" ]] || [[ "${SECRET_KEY}" == "" ]];then + echo "Error: Please set ACCESS_KEY and SECRET_KEY" + exit 1 +fi + + +if [ "${TARGET_REGION}" = "eu-central-1" ] +then + #test eu1 with zl2 container + export TARGET_NAME="eu1" + export REGION="eu-central-1" + export DOCKER_HOST="tcp://${REGION}.hyper.sh:443" +elif [ "${TARGET_REGION}" = "us-west-1" ] +then + #test zl2 with eu1 container + export TARGET_NAME="zl2" + export REGION="us-west-1" + export DOCKER_HOST="tcp://${REGION}.hyper.sh:443" +elif [ "${TARGET_REGION}" = "RegionOne" ] +then + #test packet with zl2 container + export TARGET_NAME="pkt" + export REGION="RegionOne" + export DOCKER_HOST="tcp://147.75.195.39:6443" +else + echo "unknow TARGET_REGION:${TARGET_REGION}" + exit 1 +fi +TITLE="*hypercli integration auto-test for \`${TARGET_NAME}\`* - ${BEGIN_TIME} *\`${TEST_CASE_REG}\`*" + + +# job url +JOB_URL="http://ci.hypercontainer.io:8080/job/${JOB_NAME}/${BUILD_NUMBER}/console" +echo "JOB_URL: ${JOB_URL}" + +# branch url +PR_PRE=$(expr substr ${BRANCH} 1 1) +if [ "$PR_PRE" = "#" ] +then + PR_NUMBER=$(echo ${BRANCH} | awk '{print substr($1,2)}') + echo "========== Task: test PR ${PR_NUMBER} ==========" + BRANCH_URL="https://github.com/hyperhq/hypercli/pull/${PR_NUMBER}/commits" +else + echo "========== Task: test BRANCH ${BRANCH} ==========" + BRANCH_URL="https://github.com/hyperhq/hypercli/commits/${BRANCH}" +fi +echo "BRANCH_URL: ${BRANCH_URL}" + +#ensure config for hyper cli +mkdir -p ${HYPER_CONFIG} +cat > ${HYPER_CONFIG}/config.json <> ~/.bashrc +source ~/.bashrc + +echo "##############################################################################################" +echo "## Welcome to integration test ##" +echo "##############################################################################################" +#show config for hyper cli +echo "Current hyper config: ${HYPER_CONFIG}/config.json" +echo "----------------------------------------------------------------------------------------------" +cat ${HYPER_CONFIG}/config.json \ + | sed 's/"secretkey":.*/"secretkey": "******************************",/g' \ + | sed 's/"auth":.*/"auth": "******************************"/g' +echo "----------------------------------------------------------------------------------------------" + + +## send begin message to slack +COMMIT_SHORT_ID=$(git rev-parse --short HEAD) +COMMIT_ID=$(git rev-parse HEAD) +COMMIT_URL="https://github.com/hyperhq/hypercli/commit/${COMMIT_ID}" + +ATT_LINK="LINK: GITHUB(<${BRANCH_URL}|${BRANCH}> - <${COMMIT_URL}|${COMMIT_SHORT_ID}>) JOB(<${JOB_URL}|${BUILD_NUMBER}>)" +ATTACHMENT="[{'text':'$ATT_LINK'}]" +MESSAGE="[BEGIN] - $TITLE" +slack.sh "$MESSAGE" "$ATTACHMENT" + +TEST_HOME="/go/src/github.com/hyperhq/hypercli/integration-cli" +cd /go/src/github.com/hyperhq/hypercli/integration-cli + +cat </dev/null 2>&1 +script -ec "go test -check.f '${TEST_CASE_REG}' -timeout ${TIMEOUT:-90m}" | tee $LOG +ls -l $LOG +echo ========================= + +FAIL_COUNT1=`grep "^FAIL:" ${LOG} | wc -l` +TEST_RESULT1=`grep -E "^(OK:|OOPS:)" ${LOG}` +DURATION1=`grep -P "\tgithub.com/hyperhq/hypercli/integration-cli\t" ${LOG} | awk '{print $NF}'` + +echo "----------get failed test case(1st)----------" +FAILED_FILE=failed1.log +cat ${LOG} | grep "^FAIL:" > ${FAILED_FILE} +FAILED_TEST_CASE1=`cat ${FAILED_FILE} | awk -F. '{if(NR==1){CASE=$NF}else{CASE=CASE"|"$NF}}END{printf CASE}'` +echo "-----------------------------------------" +echo "FAILED_TEST_CASE1: $FAILED_TEST_CASE1" + + +RETEST_CASE="" +RETEST_COUNT="0" +while read LINE +do + if [ "${TARGET_REGION}" = "RegionOne" ] + then + HAS_VOL=`echo ${LINE} | grep -i Volume 2>/dev/null | wc -l` + HAS_FIP=`echo ${LINE} | grep -i Fip 2>/dev/null | wc -l` + if [ $HAS_VOL -ne 0 -o $HAS_FIP -ne 0 ] + then + echo "[SKIP FOR PKT]: ${LINE}" + continue + fi + fi + CASE_NAME=`echo ${LINE} | awk -F. '{printf $NF}'` + if [ "${RETEST_CASE}" = "" ] + then + RETEST_CASE="$CASE_NAME" + else + RETEST_CASE="${RETEST_CASE}|$CASE_NAME" + fi + RETEST_COUNT=`expr $RETEST_COUNT + 1` +done < ${FAILED_FILE} + +echo "-----------------------------------------" +echo "RETEST_CASE: ${RETEST_CASE}" +echo "-----------------------------------------" + +if [ $RETEST_COUNT -ne 0 ];then + ## second test + LOG="test2.log" + echo "====================second test(${RETEST_CASE} ${TIMEOUT} ${LOG})====================" + rm -rf $LOG >/dev/null 2>&1 + script -ec "go test -check.f '${RETEST_CASE}' -timeout ${TIMEOUT:-90m}" | tee $LOG + ls -l $LOG + echo ========================= + + echo "----------get failed test case(2nd)----------" + FAILED_FILE=failed2.log + cat ${LOG} | grep "^FAIL:" > ${FAILED_FILE} + FAILED_TEST_CASE2=`cat ${FAILED_FILE} | awk -F. '{if(NR==1){CASE=$NF}else{CASE=CASE"|"$NF}}END{printf CASE}'` + echo "-----------------------------------------" + echo "FAILED_TEST_CASE2: $FAILED_TEST_CASE2" + + FAIL_COUNT2=`grep "^FAIL:" ${LOG} | wc -l` + TEST_RESULT2=`grep -E "^(OK:|OOPS:)" ${LOG}` + DURATION2=`grep -P "\tgithub.com/hyperhq/hypercli/integration-cli\t" ${LOG} | awk '{print $NF}'` + + END_TIME=`date "+%Y/%m/%d %H:%M:%S"` + if [ $FAIL_COUNT2 -ne 0 ];then + icon=":scream:" + if [ "${TEST_RESULT1}" = "" -o "${TEST_RESULT2}" = "" ];then + icon=":exclamation:" + fi + ATTACHMENT="[{'text':'${ATT_LINK}'},{'text':'DURATION(1st): ${DURATION1}'},{'text':'TEST_RESULT(1st): ${TEST_RESULT1}'},{'text':'RE_TEST_CASE(2nd): ${RETEST_CASE}'},{'text':'DURATION(2nd): ${DURATION2}'},{'text':'TEST_RESULT(2nd): ${TEST_RESULT2}'},{'text':'FAILED_TEST_CASE(2nd): $FAILED_TEST_CASE2'}]" + else + icon=":smile:" + ATTACHMENT="[{'text':'${ATT_LINK}'},{'text':'DURATION(1st): ${DURATION1}'},{'text':'TEST_RESULT(1st): ${TEST_RESULT1}'},{'text':'RE_TEST_CASE(2nd): ${RETEST_CASE}'},{'text':'DURATION(2nd): ${DURATION2}'},{'text':'TEST_RESULT(2nd): ${TEST_RESULT2}'}]" + fi + echo "ATTACHMENT(1):${ATTACHMENT}" + MESSAGE="[END] - ${TITLE} :${icon} - ${END_TIME}" + else + END_TIME=`date "+%Y/%m/%d %H:%M:%S"` + ATTACHMENT="[{'text':'${ATT_LINK}'},{'text':'DURATION: ${DURATION1}'},{'text':'TEST_RESULT: ${TEST_RESULT1}'}]" + icon=":smile:" + if [ "${TEST_RESULT1}" = "" ];then + icon=":exclamation:" + fi + if [ $FAIL_COUNT1 -ne 0 ];then + echo "first failed, second passed" + icon=":scream:" + ATTACHMENT="[{'text':'${ATT_LINK}'},{'text':'DURATION: ${DURATION1}'},{'text':'TEST_RESULT: ${TEST_RESULT1}'},{'text':'FAILED_TEST_CASE: $FAILED_TEST_CASE1'}]" + fi + echo "ATTACHMENT(2):${ATTACHMENT}" + MESSAGE="[END] - ${TITLE} :${icon} - ${END_TIME}" +fi + +cat < # run docker container + +example: + ./util.sh run + ./util.sh run etc/config + ./util.sh run etc/config.zl2 + ./util.sh run etc/config.eu1 + ./util.sh run etc/config.pkt +EOF + exit 1 + ;; +esac + + + +echo -e "\n==============================================================" +echo "Done!" + diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_api_stats_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_api_stats_test.go old mode 100644 new mode 100755 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_config_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_config_test.go old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_links_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_links_test.go old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_load_local_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_load_local_test.go old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_login_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_login_test.go old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_test.go old mode 100755 new mode 100644 diff --git a/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_unix_test.go b/vendor/github.com/hyperhq/hypercli/integration-cli/hyper_cli_run_unix_test.go old mode 100755 new mode 100644