chore: fix CI problems (#3712)

Some changed according to dependency upgrades.
alibaba · Apr 16, 2024 · 82a4ea6 · 82a4ea6
1 parent d916290
commit 82a4ea6
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 42 deletions.
diff --git a/.github/workflows/gss.yml b/.github/workflows/gss.yml
@@ -176,10 +176,10 @@ jobs:
         export NODE_IP=$(kubectl get nodes --namespace default -o jsonpath="{.items[0].status.addresses[0].address}")
 
         # 2. deploy hadoop hdfs
-        tar -zxf /home/runner/hadoop-2.10.1.tar.gz -C /tmp/
+        tar -zxf /home/runner/hadoop-2.10.2.tar.gz -C /tmp/
         cd ${GITHUB_WORKSPACE}/.github/workflows/hadoop_scripts
-        ./prepare_hadoop.sh /tmp/hadoop-2.10.1
-        export PATH=${PATH}:/tmp/hadoop-2.10.1/bin
+        ./prepare_hadoop.sh /tmp/hadoop-2.10.2
+        export PATH=${PATH}:/tmp/hadoop-2.10.2/bin
 
         # data-load-tool is needed for offline_load.sh
         # see .github/workflows/hadoop_scripts/offline_load.sh

diff --git a/.github/workflows/hadoop_scripts/offline_load.sh b/.github/workflows/hadoop_scripts/offline_load.sh
@@ -2,5 +2,5 @@
 
 BASE_DIR=$(dirname "$0")
 
-/tmp/hadoop-2.10.1/bin/hadoop jar $LOADER_DIR/data-load-tool-0.0.1-SNAPSHOT.jar com.alibaba.graphscope.groot.dataload.databuild.OfflineBuild $BASE_DIR/databuild.config
+/tmp/hadoop-2.10.2/bin/hadoop jar $LOADER_DIR/data-load-tool-0.0.1-SNAPSHOT.jar com.alibaba.graphscope.groot.dataload.databuild.OfflineBuild $BASE_DIR/databuild.config
 
diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml
@@ -513,10 +513,10 @@ jobs:
           export GS_TAG=${SHORT_SHA}
 
           # install hadoop HDFS
-          tar -zxf /home/runner/hadoop-2.10.1.tar.gz -C /tmp/
+          tar -zxf /home/runner/hadoop-2.10.2.tar.gz -C /tmp/
           cd ${GITHUB_WORKSPACE}/.github/workflows/hadoop_scripts
-          ./prepare_hadoop.sh /tmp/hadoop-2.10.1
-          export PATH=${PATH}:/tmp/hadoop-2.10.1/bin
+          ./prepare_hadoop.sh /tmp/hadoop-2.10.2
+          export PATH=${PATH}:/tmp/hadoop-2.10.2/bin
 
           # upload data to HDFS
           hadoop fs -mkdir /ldbc_sample || true

diff --git a/k8s/Makefile b/k8s/Makefile
@@ -45,7 +45,6 @@ dev-wheel:
 	cd $(WORKING_DIR) && \
 	cd ../python/graphscope && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/graphscope-dev:wheel-${VINEYARD_VERSION}-${ARCH} \
@@ -56,15 +55,13 @@ manylinux2014-ext:
 	cd $(WORKING_DIR) && \
 	cd ../python/graphscope  && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		-t graphscope/manylinux2014:ext-${ARCH} \
 		-f $(DOCKERFILES_DIR)/manylinux2014-ext.Dockerfile .
 
 graphscope-dev:
 	cd $(WORKING_DIR) && \
 	cd ../python/graphscope  && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/graphscope-dev:${VINEYARD_VERSION}-${ARCH} \
@@ -74,7 +71,6 @@ vineyard-dev:
 	cd $(WORKING_DIR) && \
 	cd ../python/graphscope  && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/vineyard-dev:${VINEYARD_VERSION}-${ARCH} \
@@ -83,7 +79,6 @@ vineyard-dev:
 vineyard-runtime:
 	cd $(WORKING_DIR) && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		-t graphscope/vineyard-runtime:${VINEYARD_VERSION}-${ARCH} \
@@ -93,7 +88,6 @@ coordinator:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target coordinator \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg CI=${CI} \
@@ -104,7 +98,6 @@ analytical:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target analytical \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -116,7 +109,6 @@ analytical-java:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target analytical-java \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -128,7 +120,6 @@ interactive-frontend:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target frontend \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -141,7 +132,6 @@ interactive-executor:
 	cd $(WORKING_DIR)/.. \
 	&& docker build \
 	    --target executor \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -155,7 +145,6 @@ interactive-experimental:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target experimental \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		-t graphscope/interactive-experimental:${VERSION} \
@@ -165,7 +154,6 @@ learning:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target learning \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -176,7 +164,6 @@ learning:
 graphscope-store:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
-		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg profile=${PROFILE} \

diff --git a/k8s/actions-runner-controller/manylinux-ci.yaml b/k8s/actions-runner-controller/manylinux-ci.yaml
@@ -21,15 +21,6 @@ spec:
             cpu: "24.0"
             memory: "60Gi"
             ephemeral-storage: 100Gi
-      - name: docker
-        resources:
-          limits:
-            cpu: "2.0"
-            memory: "8Gi"
-          requests:
-            cpu: "2.0"
-            memory: "8Gi"
-            ephemeral-storage: 1Gi
 ---
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: HorizontalRunnerAutoscaler
@@ -38,6 +29,7 @@ metadata:
 spec:
   scaleDownDelaySecondsAfterScaleOut: 900
   scaleTargetRef:
+    kind: RunnerDeployment
     name: graphscope-runners-manylinux2014
     # Uncomment the below in case the target is not RunnerDeployment but RunnerSet
     #kind: RunnerSet

diff --git a/k8s/actions-runner-controller/manylinux.yaml b/k8s/actions-runner-controller/manylinux.yaml
@@ -21,15 +21,6 @@ spec:
             cpu: "24.0"
             memory: "60Gi"
             ephemeral-storage: 100Gi
-      - name: docker
-        resources:
-          limits:
-            cpu: "2.0"
-            memory: "8Gi"
-          requests:
-            cpu: "2.0"
-            memory: "8Gi"
-            ephemeral-storage: 1Gi
 ---
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: HorizontalRunnerAutoscaler
@@ -38,6 +29,7 @@ metadata:
 spec:
   scaleDownDelaySecondsAfterScaleOut: 900
   scaleTargetRef:
+    kind: RunnerDeployment
     name: graphscope-runners-manylinux2014
     # Uncomment the below in case the target is not RunnerDeployment but RunnerSet
     #kind: RunnerSet

diff --git a/k8s/actions-runner-controller/ubuntu.yaml b/k8s/actions-runner-controller/ubuntu.yaml
@@ -13,6 +13,8 @@ spec:
       containers:
       - name: runner
         env: []
+        # securityContext:
+        #   privileged: true
         resources:
           limits:
             cpu: "31.0"
@@ -22,6 +24,15 @@ spec:
             cpu: "27.0"
             memory: "60Gi"
             ephemeral-storage: 100Gi
+      # - name: docker
+      #   resources:
+      #     limits:
+      #       cpu: "2.0"
+      #       memory: "8Gi"
+      #     requests:
+      #       cpu: "2.0"
+      #       memory: "8Gi"
+      #       ephemeral-storage: 1Gi
 ---
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: HorizontalRunnerAutoscaler
@@ -30,6 +41,7 @@ metadata:
 spec:
   scaleDownDelaySecondsAfterScaleOut: 900
   scaleTargetRef:
+    kind: RunnerDeployment
     name: graphscope-runner-ubuntu
     # Uncomment the below in case the target is not RunnerDeployment but RunnerSet
     #kind: RunnerSet

diff --git a/k8s/actions-runner-controller/ubuntu/Dockerfile b/k8s/actions-runner-controller/ubuntu/Dockerfile
@@ -8,12 +8,12 @@ RUN sudo apt update -y \
   openssh-server \
   && sudo rm -rf /var/lib/apt/lists/*
 
-RUN sudo curl -L -o /home/runner/hadoop-2.10.1.tar.gz https://mirror.cogentco.com/pub/apache/hadoop/common/hadoop-2.10.1/hadoop-2.10.1.tar.gz
+RUN sudo curl -L -o /home/runner/hadoop-2.10.2.tar.gz https://mirror.cogentco.com/pub/apache/hadoop/common/hadoop-2.10.2/hadoop-2.10.2.tar.gz
 
 RUN sudo curl -L -o /usr/local/bin/kubectl "https://dl.k8s.io/release/v1.23.5/bin/linux/amd64/kubectl" \
   && sudo chmod 0755 /usr/local/bin/kubectl
 
 RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
 
-RUN sudo curl -L -o /usr/local/bin/minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
+RUN sudo curl -L -o /usr/local/bin/minikube https://github.com/kubernetes/minikube/releases/download/v1.28.0/minikube-linux-amd64 \
     && sudo chmod 0755 /usr/local/bin/minikube
diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile
@@ -49,8 +49,7 @@ CI ?= false
 graphscope:
 	cd $(WORKING_DIR)/../.. && \
 	git submodule update --init && \
-	docker build --progress=$(BUILD_PROGRESS) \
-				 --build-arg CI=${CI} \
+	docker build --build-arg CI=${CI} \
 				 -t graphscope/graphscope:${SHORT_SHA} \
 				 -f $(WORKING_DIR)/graphscope.Dockerfile .