Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Revert the changes to the travis pipeline to fix the build failure

Browse Source 
Signed-off-by: Steven Zou <szou@vmware.com>
This commit is contained in:
Steven Zou 2018-09-27 15:11:20 +08:00
parent 55c50f310d
commit bb73e64f5d
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -44,8 +44,8 @@ apt:
- google-chrome-stable
- google-chrome-beta
before_install:
- openssl aes-256-cbc -K $encrypted_ed2284a9ecc3_key -iv $encrypted_ed2284a9ecc3_iv
-in gskey.sh.enc -out ./gskey.sh -d
#- openssl aes-256-cbc -K $encrypted_ed2284a9ecc3_key -iv $encrypted_ed2284a9ecc3_iv
# -in gskey.sh.enc -out ./gskey.sh -d
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname
-s`-`uname -m` > docker-compose
- chmod +x docker-compose

58
tests/travis/api_run.sh
View File

@ -1,29 +1,29 @@
#!/bin/bash
source gskey.sh
#source gskey.sh
sudo gsutil version -l
#sudo gsutil version -l
harbor_logs_bucket="harbor-ci-logs"
#harbor_logs_bucket="harbor-ci-logs"
# GC credentials
keyfile="/home/travis/harbor-ci-logs.key"
botofile="/home/travis/.boto"
echo -en $GS_PRIVATE_KEY > $keyfile
sudo chmod 400 $keyfile
echo "[Credentials]" >> $botofile
echo "gs_service_key_file = $keyfile" >> $botofile
echo "gs_service_client_id = $GS_CLIENT_EMAIL" >> $botofile
echo "[GSUtil]" >> $botofile
echo "content_language = en" >> $botofile
echo "default_project_id = $GS_PROJECT_ID" >> $botofile
#keyfile="/home/travis/harbor-ci-logs.key"
#botofile="/home/travis/.boto"
#echo -en $GS_PRIVATE_KEY > $keyfile
#sudo chmod 400 $keyfile
#echo "[Credentials]" >> $botofile
#echo "gs_service_key_file = $keyfile" >> $botofile
#echo "gs_service_client_id = $GS_CLIENT_EMAIL" >> $botofile
#echo "[GSUtil]" >> $botofile
#echo "content_language = en" >> $botofile
#echo "default_project_id = $GS_PROJECT_ID" >> $botofile
# GS util
function uploader {
sudo gsutil cp $1 gs://$2/$1
sudo gsutil -D setacl public-read gs://$2/$1 &> /dev/null
}
#function uploader {
# sudo gsutil cp $1 gs://$2/$1
# sudo gsutil -D setacl public-read gs://$2/$1 &> /dev/null
#}
set +e
#set +e
docker ps
# run db auth api cases
@ -36,15 +36,15 @@ if [ "$1" = 'LDAP' ]; then
fi
## --------------------------------------------- Upload Harbor CI Logs -------------------------------------------
outfile="integration_logs_$TRAVIS_BUILD_NUMBER_$TRAVIS_COMMIT.tar.gz"
sudo tar -zcvf $outfile output.xml log.html /var/log/harbor/*
if [ -f "$outfile" ]; then
uploader $outfile $harbor_logs_bucket
echo "----------------------------------------------"
echo "Download test logs:"
echo "https://storage.googleapis.com/harbor-ci-logs/$outfile"
echo "----------------------------------------------"
else
echo "No log output file to upload"
fi
#outfile="integration_logs_$TRAVIS_BUILD_NUMBER_$TRAVIS_COMMIT.tar.gz"
#sudo tar -zcvf $outfile output.xml log.html /var/log/harbor/*
#if [ -f "$outfile" ]; then
# uploader $outfile $harbor_logs_bucket
# echo "----------------------------------------------"
# echo "Download test logs:"
# echo "https://storage.googleapis.com/harbor-ci-logs/$outfile"
# echo "----------------------------------------------"
#else
# echo "No log output file to upload"
#fi