mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-22 02:05:41 +01:00
fix some cicd problems
Signed-off-by: Ziming Zhang <zziming@vmware.com>
This commit is contained in:
Ziming Zhang
Ziming
parent
4c41ac81d9
commit
41e8bb91ce
16
.github/workflows/CI.yml
vendored
16
.github/workflows/CI.yml
vendored
@ -71,12 +71,15 @@ jobs:
|
||||
run: |
|
||||
cd src/github.com/goharbor/harbor
|
||||
env
|
||||
df -h
|
||||
bash ./tests/showtime.sh ./tests/ci/ut_install.sh
|
||||
- name: script
|
||||
run: |
|
||||
echo IP: $IP
|
||||
df -h
|
||||
cd src/github.com/goharbor/harbor
|
||||
bash ./tests/showtime.sh ./tests/ci/ut_run.sh $IP
|
||||
df -h
|
||||
- name: Codecov For BackEnd
|
||||
uses: codecov/codecov-action@v1
|
||||
with:
|
||||
@ -120,6 +123,7 @@ jobs:
|
||||
cd src/github.com/goharbor/harbor
|
||||
pwd
|
||||
env
|
||||
df -h
|
||||
#sudo apt install -y xvfb
|
||||
#xvfb-run ls
|
||||
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||
@ -143,12 +147,15 @@ jobs:
|
||||
run: |
|
||||
cd src/github.com/goharbor/harbor
|
||||
env
|
||||
df -h
|
||||
bash ./tests/showtime.sh ./tests/ci/api_common_install.sh $IP DB
|
||||
- name: script
|
||||
run: |
|
||||
cd src/github.com/goharbor/harbor
|
||||
echo IP: $IP
|
||||
df -h
|
||||
bash ./tests/showtime.sh ./tests/ci/api_run.sh DB $IP
|
||||
df -h
|
||||
|
||||
APITEST_LDAP:
|
||||
env:
|
||||
@ -185,6 +192,7 @@ jobs:
|
||||
cd src/github.com/goharbor/harbor
|
||||
pwd
|
||||
env
|
||||
df -h
|
||||
#sudo apt install -y xvfb
|
||||
#xvfb-run ls
|
||||
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||
@ -200,12 +208,15 @@ jobs:
|
||||
run: |
|
||||
cd src/github.com/goharbor/harbor
|
||||
env
|
||||
df -h
|
||||
bash ./tests/showtime.sh ./tests/ci/api_common_install.sh $IP LDAP
|
||||
- name: script
|
||||
run: |
|
||||
echo IP: $IP
|
||||
df -h
|
||||
cd src/github.com/goharbor/harbor
|
||||
bash ./tests/showtime.sh ./tests/ci/api_run.sh LDAP $IP
|
||||
df -h
|
||||
|
||||
OFFLINE:
|
||||
env:
|
||||
@ -243,6 +254,7 @@ jobs:
|
||||
cd src/github.com/goharbor/harbor
|
||||
pwd
|
||||
env
|
||||
df -h
|
||||
#sudo apt install -y xvfb
|
||||
#xvfb-run ls
|
||||
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||
@ -257,8 +269,10 @@ jobs:
|
||||
- name: script
|
||||
run: |
|
||||
echo IP: $IP
|
||||
df -h
|
||||
cd src/github.com/goharbor/harbor
|
||||
bash ./tests/showtime.sh ./tests/ci/distro_installer.sh
|
||||
df -h
|
||||
|
||||
UI_UT:
|
||||
env:
|
||||
@ -276,8 +290,10 @@ jobs:
|
||||
- name: script
|
||||
run: |
|
||||
echo IP: $IP
|
||||
df -h
|
||||
cd src/github.com/goharbor/harbor
|
||||
bash ./tests/showtime.sh ./tests/ci/ui_ut_run.sh
|
||||
df -h
|
||||
- name: Codecov For UI
|
||||
uses: codecov/codecov-action@v1
|
||||
with:
|
||||
|
||||
4
Makefile
4
Makefile
@ -383,8 +383,8 @@ build:
|
||||
build_base_docker:
|
||||
@for name in chartserver clair clair-adapter trivy-adapter core db jobservice log nginx notary-server notary-signer portal prepare redis registry registryctl; do \
|
||||
echo $$name ; \
|
||||
$(DOCKERBUILD) --pull -f $(MAKEFILEPATH_PHOTON)/$$name/Dockerfile.base -t $(BASEIMAGENAMESPACE)/harbor-$$name-base:$(BASEIMAGETAG) . ; \
|
||||
$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(BASEIMAGENAMESPACE)/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) ; \
|
||||
$(DOCKERBUILD) --pull -f $(MAKEFILEPATH_PHOTON)/$$name/Dockerfile.base -t $(BASEIMAGENAMESPACE)/harbor-$$name-base:$(BASEIMAGETAG) . && \
|
||||
$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(BASEIMAGENAMESPACE)/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) || exit 1; \
|
||||
done
|
||||
|
||||
pull_base_docker:
|
||||
|
||||
@ -31,5 +31,11 @@ if [ $GITHUB_TOKEN ];
|
||||
then
|
||||
sed "s/# github_token: xxx/github_token: $GITHUB_TOKEN/" -i make/harbor.yml
|
||||
fi
|
||||
sudo make install GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage CLARITYIMAGE=goharbor/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true CLAIRFLAG=true TRIVYFLAG=true CHARTFLAG=true GEN_TLS=true
|
||||
sleep 10
|
||||
sudo make install COMPILETAG=compile_golangimage CLARITYIMAGE=goharbor/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true CLAIRFLAG=true TRIVYFLAG=true CHARTFLAG=true GEN_TLS=true
|
||||
|
||||
# waiting 5 minutes to start
|
||||
for((i=1;i<=30;i++)); do
|
||||
echo $i waiting 10 seconds...
|
||||
sleep 10
|
||||
curl -k -L -f 127.0.0.1/api/v2.0/systeminfo && break
|
||||
done
|
||||
@ -28,13 +28,9 @@ function uploader {
|
||||
set +e
|
||||
|
||||
docker ps
|
||||
# Log storage space before running API_DB.robot
|
||||
df -H
|
||||
# run db auth api cases
|
||||
if [ "$1" = 'DB' ]; then
|
||||
pybot -X -v ip:$2 -v HARBOR_PASSWORD:Harbor12345 $DIR/../../tests/robot-cases/Group0-BAT/API_DB.robot
|
||||
# Log storage space after running API_DB.robot
|
||||
df -H
|
||||
elif [ "$1" = 'LDAP' ]; then
|
||||
# run ldap api cases
|
||||
python $DIR/../../tests/configharbor.py -H $IP -u $HARBOR_ADMIN -p $HARBOR_ADMIN_PASSWD -c auth_mode=ldap_auth \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
IP=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print $1}'`
|
||||
IP=$(hostname -I | awk '{print $1}')
|
||||
|
||||
#echo $IP
|
||||
sudo sed "s/reg.mydomain.com/$IP/" make/harbor.yml.tmpl |sudo tee make/harbor.yml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user