From f77ca7726c48bd5c723a79164c679b7e1973b610 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 26 Jun 2020 10:19:27 +0530 Subject: [PATCH] test: fix cgo errors before building --- .travis.yml | 7 +++++-- tests/docker-test.sh | 16 +++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e1c5951..fc5b100b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -153,7 +153,10 @@ jobs: - stage: "Build and test edge images" if: type = pull_request before_install: - - sudo apt-get update && sudo apt-get -y install docker-compose + - sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + - sudo chmod +x /usr/local/bin/docker-compose + - sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + - sudo apt-get update && sudo apt-get -y install w3m script: - docker build -t frappe/frappe-socketio:edge -f build/frappe-socketio/Dockerfile . - docker build -t frappe/frappe-worker:develop -f build/frappe-worker/Dockerfile . @@ -164,7 +167,7 @@ jobs: - stage: "Pull and test edge images" if: branch = develop AND type != pull_request before_install: - - sudo apt-get update && sudo apt-get -y install docker-compose + - sudo apt-get update && sudo apt-get -y install docker-compose w3m script: - ./tests/docker-test.sh - stage: "Helm Chart Release" diff --git a/tests/docker-test.sh b/tests/docker-test.sh index fc080003..597c3c2a 100755 --- a/tests/docker-test.sh +++ b/tests/docker-test.sh @@ -80,7 +80,7 @@ curl -sS http://test.localhost/api/method/version echo -e "\n" echo -e "\e[1m\e[4mCheck Created Site Index Page\e[0m" -curl -s http://test.localhost # | w3m -T text/html -dump +curl -s http://test.localhost | w3m -T text/html -dump echo -e "\n" echo -e "\e[1m\e[4mSet version to edge\e[0m" @@ -94,12 +94,6 @@ docker-compose \ -f installation/docker-compose-erpnext.yml \ -f installation/erpnext-publish.yml \ stop -docker-compose \ - --project-name frappebench00 \ - -f installation/docker-compose-common.yml \ - -f installation/docker-compose-erpnext.yml \ - -f installation/erpnext-publish.yml \ - pull docker-compose \ --project-name frappebench00 \ -f installation/docker-compose-common.yml \ @@ -116,7 +110,7 @@ curl -sS http://test.localhost/api/method/version echo -e "\n" echo -e "\e[1m\e[4mCheck Migrated Site Index Page\e[0m" -curl -s http://test.localhost # | w3m -T text/html -dump +curl -s http://test.localhost | w3m -T text/html -dump echo -e "\n" echo -e "\e[1m\e[4mBackup site\e[0m" @@ -227,7 +221,7 @@ echo $RESTORE_STATUS echo -e "\n" echo -e "\e[1m\e[4mCheck Restored Site Index Page\e[0m" -curl -s http://test.localhost # | w3m -T text/html -dump +curl -s http://test.localhost | w3m -T text/html -dump echo -e "\n" echo -e "\e[1m\e[4mCreate new site (edge)\e[0m" @@ -266,7 +260,7 @@ echo $RESTORE_STATUS echo -e "\n" echo -e "\e[1m\e[4mCheck New Edge Index Page\e[0m" -curl -s http://edge.localhost # | w3m -T text/html -dump +curl -s http://edge.localhost | w3m -T text/html -dump echo -e "\n" echo -e "\e[1m\e[4mMigrate command in edge container\e[0m" @@ -320,7 +314,7 @@ echo $RESTORE_STATUS echo -e "\n" echo -e "\e[1m\e[4mCheck Overwritten Index Page\e[0m" -curl -s http://test.localhost # | w3m -T text/html -dump +curl -s http://test.localhost | w3m -T text/html -dump echo -e "\n" echo -e "\e[1m\e[4mCheck console command for site test.localhost\e[0m"