Merge branch 'master' of https://github.com/goharbor/harbor into fix-swagger-dep

.github/workflows/CI.yml

@@ -163,19 +163,10 @@ jobs:
           cryptsetup-bin
           export VERSION=3.5.3 && \
           wget https://github.com/sylabs/singularity/releases/download/v${VERSION}/singularity-${VERSION}.tar.gz && \
-          tar -xzf singularity-${VERSION}.tar.gz && \
+          tar -xzf singularity-${VERSION}.tar.gz && cd singularity
-          cd singularity
+          ./mconfig && make -C builddir && sudo make -C builddir install
-          ./mconfig && \
+          sudo apt-get update -y ; sudo apt-get install -y zbar-tools libzbar-dev python-zbar python3.7
-          make -C builddir && \
+          sudo rm /usr/bin/python ; sudo ln -s /usr/bin/python3.7 /usr/bin/python ; sudo apt-get install -y python3-pip
-          sudo make -C builddir install
-          python -V
-          sudo apt-get update -y && sudo apt-get install -y zbar-tools libzbar-dev python-zbar
-          sudo apt-get update -y
-          sudo apt-get install -y python3.6
-          sudo rm /usr/bin/python
-          sudo ln -s /usr/bin/python3.6 /usr/bin/python
-          sudo apt-get install -y python3-pip
-          python -V
       - name: install
         run: |
           cd src/github.com/goharbor/harbor
@@ -237,13 +228,8 @@ jobs:
           echo '{"insecure-registries" : ["'$IP':5000"]}' | sudo tee /etc/docker/daemon.json
           echo "::set-env name=IP::$IP"
           python -V
-          sudo apt-get update -y && sudo apt-get install -y zbar-tools libzbar-dev python-zbar
+          sudo apt-get update -y ; sudo apt-get install -y zbar-tools libzbar-dev python-zbar python3.7
-          sudo apt-get update -y
+          sudo rm /usr/bin/python ; sudo ln -s /usr/bin/python3.7 /usr/bin/python ; sudo apt-get install -y python3-pip
-          sudo apt-get install -y python3.6
-          sudo rm /usr/bin/python
-          sudo ln -s /usr/bin/python3.6 /usr/bin/python
-          sudo apt-get install -y python3-pip
-          python -V
       - name: install
         run: |
           cd src/github.com/goharbor/harbor

tests/ci/api_common_install.sh

@@ -18,18 +18,20 @@ if [ "$2" = 'LDAP' ]; then
     cd tests && sudo ./ldapprepare.sh && cd ..
 fi
 
-
-
 # prepare a chart file for API_DB test...
 sudo curl -o $DIR/../../tests/apitests/python/mariadb-4.3.1.tgz https://storage.googleapis.com/harbor-builds/bin/charts/mariadb-4.3.1.tgz
 
-sudo apt-get update && sudo apt-get install -y --no-install-recommends python-dev openjdk-7-jdk libssl-dev && sudo apt-get autoremove -y && sudo rm -rf /var/lib/apt/lists/*
 sudo wget https://bootstrap.pypa.io/get-pip.py && sudo python ./get-pip.py && sudo pip install --ignore-installed urllib3 chardet requests && sudo pip install robotframework==3.2.1 robotframework-httplibrary requests --upgrade
 sudo make swagger_client
+#TODO: Swagger python package used to installed into dist-packages, but it's changed into site-packages all in a sudden, we havn't found the root cause.
+#      so current workround is to copy swagger packages from site-packages to dist-packages.
+sudo cp -r /usr/lib/python3.7/site-packages/* /usr/local/lib/python3.7/dist-packages
+
 if [ $GITHUB_TOKEN ];
 then
     sed "s/# github_token: xxx/github_token: $GITHUB_TOKEN/" -i make/harbor.yml
 fi
+
 sudo make build_base_docker compile build prepare COMPILETAG=compile_golangimage GOBUILDTAGS="include_oss include_gcs" NOTARYFLAG=true CLAIRFLAG=true TRIVYFLAG=true CHARTFLAG=true GEN_TLS=true
 
 # set the debugging env

tests/robot-cases/Group0-BAT/API_DB.robot

@@ -2,7 +2,6 @@
 Documentation  Harbor BATs
 Resource  ../../resources/APITest-Util.robot
 Resource  ../../resources/Docker-Util.robot
-Library  ../../apitests/python/library/Harbor.py  ${SERVER_CONFIG}
 Library  OperatingSystem
 Library  String
 Library  Collections