From 8c98bc5890f9fa017a574cc6d56d64d9d6e9c12b Mon Sep 17 00:00:00 2001 From: Siyuan Zhang Date: Tue, 14 Mar 2023 16:45:26 +0800 Subject: [PATCH] Fix Hadoop test by export more Hadoop environment variables (#2515) Signed-off-by: Tao He Co-authored-by: Tao He --- .github/workflows/build-graphscope-wheels-macos.yml | 2 +- .github/workflows/gae.yml | 2 +- .github/workflows/networkx-forward-algo-nightly.yml | 2 +- .github/workflows/nightly.yml | 2 +- charts/graphscope/values.yaml | 2 +- k8s/Makefile | 2 +- k8s/actions-runner-controller/manylinux/Makefile | 2 +- k8s/dockerfiles/vineyard-dev.Dockerfile | 1 + k8s/internal/Makefile | 2 +- python/graphscope/config.py | 2 +- python/graphscope/tests/kubernetes/test_demo_script.py | 3 +-- scripts/install_deps.sh | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml index 70fa53c823ce..bb336e57f6c3 100644 --- a/.github/workflows/build-graphscope-wheels-macos.yml +++ b/.github/workflows/build-graphscope-wheels-macos.yml @@ -144,7 +144,7 @@ jobs: run: | source ~/.graphscope_env python3 -m pip install libclang - git clone --single-branch -b v0.13.0 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d + git clone --single-branch -b v0.13.3 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d cd /tmp/v6d git submodule update --init cmake . -DCMAKE_INSTALL_PREFIX=/usr/local \ diff --git a/.github/workflows/gae.yml b/.github/workflows/gae.yml index bbfc395e5191..1c7a6f2592ce 100644 --- a/.github/workflows/gae.yml +++ b/.github/workflows/gae.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.13.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.13.3 options: --shm-size 4096m steps: diff --git a/.github/workflows/networkx-forward-algo-nightly.yml b/.github/workflows/networkx-forward-algo-nightly.yml index 4e2792401c58..31d104e33300 100644 --- a/.github/workflows/networkx-forward-algo-nightly.yml +++ b/.github/workflows/networkx-forward-algo-nightly.yml @@ -17,7 +17,7 @@ jobs: run: shell: bash --noprofile --norc -eo pipefail {0} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.13.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.13.3 options: --shm-size 4096m diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5fee2aab5eb0..1cefa38c6cd3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -43,7 +43,7 @@ jobs: fi sudo mkdir /opt/graphscope sudo chown -R $(id -u):$(id -g) /opt/graphscope - ./gs install-deps dev --v6d-version v0.13.0 + ./gs install-deps dev --v6d-version v0.13.3 - name: Setup tmate session if: false diff --git a/charts/graphscope/values.yaml b/charts/graphscope/values.yaml index 6e9e43e83c76..61032e56aa07 100644 --- a/charts/graphscope/values.yaml +++ b/charts/graphscope/values.yaml @@ -93,7 +93,7 @@ vineyard: image: name: vineyardcloudnative/vineyardd # Overrides the image tag whose default is the chart appVersion. - tag: v0.13.0 + tag: v0.13.3 resources: requests: cpu: 0.5 diff --git a/k8s/Makefile b/k8s/Makefile index aae126c5d7c9..92b099596ee3 100644 --- a/k8s/Makefile +++ b/k8s/Makefile @@ -7,7 +7,7 @@ ifeq ($(REGISTRY),) endif VERSION ?= latest -VINEYARD_VERSION ?= v0.13.0 +VINEYARD_VERSION ?= v0.13.3 # This is the version of builder base image in most cases, except for graphscope-dev BUILDER_VERSION ?= $(VINEYARD_VERSION) # This is the version of runtime base image diff --git a/k8s/actions-runner-controller/manylinux/Makefile b/k8s/actions-runner-controller/manylinux/Makefile index 3d2b279c786d..278b5f35d132 100644 --- a/k8s/actions-runner-controller/manylinux/Makefile +++ b/k8s/actions-runner-controller/manylinux/Makefile @@ -12,7 +12,7 @@ TARGETPLATFORM ?= $(shell arch) RUNNER_VERSION ?= 2.287.1 DOCKER_VERSION ?= 20.10.12 -VINEYARD_VERSION ?= v0.13.0 +VINEYARD_VERSION ?= v0.13.3 BUILDER_VERSION ?= $(VINEYARD_VERSION) # default list of platforms for which multiarch image is built diff --git a/k8s/dockerfiles/vineyard-dev.Dockerfile b/k8s/dockerfiles/vineyard-dev.Dockerfile index 6b180fc4268a..1a074d7f621b 100644 --- a/k8s/dockerfiles/vineyard-dev.Dockerfile +++ b/k8s/dockerfiles/vineyard-dev.Dockerfile @@ -19,6 +19,7 @@ ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$GRAPHSCOPE_HOME/lib:$GRAPHSCOPE_HOME/lib ENV JAVA_HOME=/usr/lib/jvm/java HADOOP_HOME=/opt/hadoop-3.3.0 ENV HADOOP_CONF_DIR=$HADOOP_HOME/etc/hadoop HADOOP_COMMON_LIB_NATIVE_DIR=$HADOOP_HOME/lib/native +ENV HADOOP_YARN_HOME=$HADOOP_HOME HADOOP_MAPRED_HOME=$HADOOP_HOME ENV PATH=$PATH:/opt/rh/devtoolset-8/root/usr/bin:/opt/rh/rh-python38/root/usr/local/bin ENV PATH=$PATH:$GRAPHSCOPE_HOME/bin:$HADOOP_HOME/bin:/home/graphscope/.local/bin diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile index a44ff50dfd4d..5d1023cfc73d 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -34,7 +34,7 @@ GRAPHSCOPE_HOME ?= /usr/local INSTALL_PREFIX ?= /opt/graphscope VERSION ?= latest -VINEYARD_VERSION ?= v0.13.0 +VINEYARD_VERSION ?= v0.13.3 PROFILE ?= release CI ?= false diff --git a/python/graphscope/config.py b/python/graphscope/config.py index cc74c51ffa6b..38b303a097be 100644 --- a/python/graphscope/config.py +++ b/python/graphscope/config.py @@ -68,7 +68,7 @@ class GSConfig(object): # vineyard resource configuration # image for vineyard container - k8s_vineyard_image = "vineyardcloudnative/vineyardd:v0.13.0" + k8s_vineyard_image = "vineyardcloudnative/vineyardd:v0.13.3" k8s_vineyard_daemonset = None k8s_vineyard_cpu = 0.5 k8s_vineyard_mem = "512Mi" diff --git a/python/graphscope/tests/kubernetes/test_demo_script.py b/python/graphscope/tests/kubernetes/test_demo_script.py index ec3a15790472..4435634d7d4f 100644 --- a/python/graphscope/tests/kubernetes/test_demo_script.py +++ b/python/graphscope/tests/kubernetes/test_demo_script.py @@ -113,8 +113,7 @@ def p2p_property_dir(): return "/testingdata/property" -# @pytest.mark.skipif("HDFS_HOST" not in os.environ, reason="HDFS not specified") -@pytest.mark.skip(reason="Fix pyarrow version @siyuan0322") +@pytest.mark.skipif("HDFS_HOST" not in os.environ, reason="HDFS not specified") def test_demo_on_hdfs(gs_session_distributed): graph = gs_session_distributed.g() graph = graph.add_vertices( diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 36140eb72cc3..f92db8430096 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -14,8 +14,8 @@ readonly GREEN="\033[0;32m" readonly NC="\033[0m" # No Color readonly GRAPE_BRANCH="master" # libgrape-lite branch -readonly V6D_VERSION="0.13.0" # vineyard version -readonly V6D_BRANCH="v0.13.0" # vineyard branch +readonly V6D_VERSION="0.13.3" # vineyard version +readonly V6D_BRANCH="v0.13.3" # vineyard branch readonly OUTPUT_ENV_FILE="${HOME}/.graphscope_env" IS_IN_WSL=false && [[ ! -z "${IS_WSL}" || ! -z "${WSL_DISTRO_NAME}" ]] && IS_IN_WSL=true