fix hugegraph test with apache release 1.2

.github/workflows/code_stst.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   code_statistics:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
      - id: stat_cmd
        run: |

.github/workflows/rocksdb.yml

@@ -12,93 +12,44 @@ on:
   # 手动触发
   workflow_dispatch:
 
-
 jobs:
   # job: openSource and no auth
   openSource_no_auth:
     name: openSource and no auth
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
+
       - name: install JDK 8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'adopt'
 
       - name: cache maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: install python 3.7
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-          architecture: 'x64'
-
-      - name: cache python dependencies
-        uses: actions/cache@v2
-        id: cache-pip
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      - name: checkout python scripts
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
-
-      - name: install python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r ./requirements.txt
-
-      - name: deploy hugegraph
-        run: |
-          python src/deploy_start.py all
-
-      - name: decompress dataset.zip
-        run: |
-          unzip src/config/dataset.zip
-          mv dataset src/config/
-
-      - name: run test cases
-        run: |
-          pytest --html=test.html --capture=tee-sys
-
-
-  # job: openSource and exist auth
-  openSource_exist_auth:
-    name: openSource and exist auth
-    runs-on: ubuntu-16.04
-    steps:
-      - name: install JDK 8
-        uses: actions/setup-java@v2
+      - name: Use Node.js 16
+        uses: actions/setup-node@v4
         with:
-          java-version: '8'
-          distribution: 'adopt'
+          node-version: '16'
 
-      - name: cache maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+      - name: Get Yarn path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - name: install python 3.7
-        uses: actions/setup-python@v2
+      - name: install python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.10'
           architecture: 'x64'
 
       - name: cache python dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache-pip
         with:
           path: ~/.cache/pip
@@ -107,7 +58,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: checkout python scripts
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
@@ -118,23 +69,75 @@ jobs:
 
       - name: deploy hugegraph
         run: |
-          sed -i -e "s/^is_auth.*$/is_auth = True/g" src/config/basic_config.py
-          sed -i -e "s/^admin_password.*$/admin_password = {'admin': '123456'}/g" src/config/basic_config.py
-          sed -i -e "s/^test_password.*$/test_password = {'tester': '123456'}/g" src/config/basic_config.py
           python src/deploy_start.py all
 
-
       - name: decompress dataset.zip
         run: |
           unzip src/config/dataset.zip
           mv dataset src/config/
-
+          
       - name: run test cases
         run: |
           pytest --html=test.html --capture=tee-sys
 
-
-
-
-
 
+  # job: openSource and exist auth
+#  openSource_exist_auth:
+#    name: openSource and exist auth
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: install JDK 8
+#        uses: actions/setup-java@v2
+#        with:
+#          java-version: '8'
+#          distribution: 'adopt'
+#
+#      - name: cache maven repository
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/.m2/repository
+#          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: |
+#            ${{ runner.os }}-maven-
+#
+#      - name: install python 3.7
+#        uses: actions/setup-python@v2
+#        with:
+#          python-version: '3.7'
+#          architecture: 'x64'
+#
+#      - name: cache python dependencies
+#        uses: actions/cache@v2
+#        id: cache-pip
+#        with:
+#          path: ~/.cache/pip
+#          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+#          restore-keys: |
+#            ${{ runner.os }}-pip-
+#
+#      - name: checkout python scripts
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 2
+#
+#      - name: install python dependencies
+#        run: |
+#          python -m pip install --upgrade pip
+#          pip install -r ./requirements.txt
+#
+#      - name: deploy hugegraph
+#        run: |
+#          sed -i -e "s/^is_auth.*$/is_auth = True/g" src/config/basic_config.py
+#          sed -i -e "s/^admin_password.*$/admin_password = {'admin': '123456'}/g" src/config/basic_config.py
+#          sed -i -e "s/^test_password.*$/test_password = {'tester': '123456'}/g" src/config/basic_config.py
+#          python src/deploy_start.py all
+#
+#
+#      - name: decompress dataset.zip
+#        run: |
+#          unzip src/config/dataset.zip
+#          mv dataset src/config/
+#
+#      - name: run test cases
+#        run: |
+#          pytest --html=test.html --capture=tee-sys

README.md

@@ -1,3 +1,14 @@
 # hugegraph-test
+
 CI testing is carried out through this project for hugegraph
 
+```
+cd hugegraph-test
+
+pip install -r requirements.txt
+
+cd src
+python deploy_start.py all
+
+pytest
+```

requirements.txt

@@ -1,14 +1,18 @@
 attrs==20.3.0
 certifi==2020.12.5
+cffi==1.16.0
 chardet==4.0.0
+cryptography==41.0.5
 idna==2.10
 importlib-metadata==3.7.3
 iniconfig==1.1.1
 packaging==20.9
 pluggy==0.13.1
 py==1.10.0
+pycparser==2.21
+pyOpenSSL==22.0.0
 pyparsing==2.4.7
-pytest==6.2.2
+pytest==6.2.5
 pytest-html==3.1.1
 pytest-metadata==1.11.0
 requests==2.25.1

src/common/deploy_graph.py

@@ -13,6 +13,7 @@
 from src.common.file_basic import is_match_re
 from src.common.file_basic import is_exists_path
 from src.common.file_basic import alter_properties
+from src.config import basic_config as _cfg
 
 
 def get_code(pwd, git_obj, code_dir):
@@ -26,11 +27,11 @@ def get_code(pwd, git_obj, code_dir):
     url = git_obj['url']
     if not is_match_re(pwd, code_dir):
         clone_cmd = 'cd %s && git clone %s && cd %s && git checkout %s' % (pwd, url, code_dir, branch)
-        print('clone code: ' + clone_cmd)
+        print('clone code cmd: ' + clone_cmd)
         os.system(clone_cmd)
     else:
         pull_cmd = 'cd %s/%s && git checkout %s && git pull' % (pwd, code_dir, branch)
-        print('pull code: ' + pull_cmd)
+        print('pull code cmd: ' + pull_cmd)
         os.system(pull_cmd)
 
 
@@ -53,7 +54,7 @@ def compile_package(dir_code_path):
         print(cmd)
         os.system(cmd)
     else:
-        cmd = 'cd %s && mvn clean package -Dmaven.test.skip=true -q | grep \"tar.gz\"' % dir_code_path
+        cmd = 'cd %s && mvn clean package -P stage -DskipTests -ntp' % dir_code_path
         print(cmd)
         os.system(cmd)
 
@@ -80,6 +81,19 @@ def set_server_properties(package_dir_path, host, server_port, gremlin_port):
                      '#port: 8182',
                      'port: %d' % gremlin_port)
 
+    if _cfg.is_auth is True:
+        graph_conf = package_dir_path + f'/conf/graphs/{_cfg.graph_name}.properties'
+        alter_properties(graph_conf,
+                         'gremlin.graph=org.apache.hugegraph.HugeFactory'
+                         'gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy')
+
+        alter_properties(rest_conf,
+                         '#auth.authenticator=',
+                         'auth.authenticator=org.apache.hugegraph.auth.ConfigAuthenticator')
+
+        # alter_properties(gremlin_conf,
+        #                  )
+
 
 def set_hubble_properties(package_dir_path, host, port):
     """
@@ -126,23 +140,41 @@ def __init__(self, obj):
         self.hubble_git = obj.hubble_git
 
     @staticmethod
-    def server(self):
+    def server(conf):
         """
         :return:
         """
-        code_dir = 'hugegraph'
-        code_dir_path = self.code_path + '/' + code_dir
-        re_dir = '^%s-(\d).(\d{1,2}).(\d)$' % code_dir
-
-        is_exists_path(self.code_path)
-        get_code(self.code_path, self.server_git, code_dir)
+        code_dir = 'incubator-hugegraph'
+        server_module = 'hugegraph-server'
+        build_dir_prefix = 'apache-hugegraph-incubating'
+        code_dir_path = os.path.join(conf.code_path, code_dir)
+        server_module_path = os.path.join(code_dir_path, server_module)
+        re_dir = '^%s-(\d).(\d{1,2}).(\d)$' % build_dir_prefix
+
+        is_exists_path(conf.code_path)
+        get_code(conf.code_path, conf.server_git, code_dir)
         compile_package(code_dir_path)
-        #  start graph_server
-        package_dir_name = is_match_re(code_dir_path, re_dir)
-        package_dir_path = code_dir_path + '/' + package_dir_name
-        set_server_properties(package_dir_path, self.graph_host, self.server_port, self.gremlin_port)
+        # start graph_server
+        package_dir_name = is_match_re(server_module_path, re_dir)
+        package_dir_path = os.path.join(server_module_path, package_dir_name)
+        set_server_properties(package_dir_path, conf.graph_host, conf.server_port, conf.gremlin_port)
         start_graph(package_dir_path, 'server')
 
+    @staticmethod
+    def toolchain(conf):
+        code_dir = 'incubator-hugegraph-toolchain'
+        code_dir_path = os.path.join(conf.code_path, code_dir)
+        is_exists_path(conf.code_path)
+        get_code(conf.code_path, conf.toolchain_git, code_dir)
+        compile_package(code_dir_path)
+
+        # set properties && start hubble
+        hubble_package_dir_name = os.path.join(code_dir_path,
+                                               'apache-hugegraph-toolchain-incubating-1.0.0',
+                                               'apache-hugegraph-hubble-incubating-1.0.0')
+        # set_hubble_properties(hubble_package_dir_name, conf.graph_host, conf.hubble_port)
+        start_graph(hubble_package_dir_name, 'hubble')
+
     @staticmethod
     def hubble(self):
         """
@@ -169,14 +201,14 @@ def hubble(self):
         start_graph(package_dir_path, 'hubble')
 
     @staticmethod
-    def loader(self):
+    def loader(conf):
         """
         :return:
         """
         code_dir = 'hugegraph-loader'
-        code_dir_path = self.code_path + '/' + code_dir
-        is_exists_path(self.code_path)
-        get_code(self.code_path, self.loader_git, code_dir)
+        code_dir_path = conf.code_path + '/' + code_dir
+        is_exists_path(conf.code_path)
+        get_code(conf.code_path, conf.loader_git, code_dir)
         compile_package(code_dir_path)
 
     @staticmethod

src/common/file_basic.py

@@ -6,6 +6,7 @@
 """
 import re
 import os
+import shutil
 
 
 def alter_properties(file, old_str, new_str):
@@ -34,8 +35,6 @@ def is_match_re(dir_path, re_rule):
         if match_obj is not None:
             res = name
             break
-        else:
-            continue
     return res
 
 

src/common/loader.py

@@ -15,8 +15,8 @@
 from src.common.file_basic import is_match_re
 from src.config import basic_config as _cfg
 
-loader_name = is_match_re(_cfg.code_path + '/hugegraph-loader', "^hugegraph-loader-(\d).(\d{1,2}).(\d)$")
-loader_path = _cfg.code_path + '/hugegraph-loader' + '/' + loader_name
+loader_name = is_match_re(_cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0', "^apache-hugegraph-loader-incubating-(\d).(\d{1,2}).(\d)$")
+loader_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0' + '/' + loader_name
 dataset_path = root_path + 'src/config/dataset/'