Temporarily comment out the compile and upload of the centos8 compile…

… container.
kubeovn · Feb 21, 2022 · 61c5ebb · 61c5ebb
1 parent 4318b32
commit 61c5ebb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -81,11 +81,11 @@ jobs:
           name: centos7-compile
           path: centos7-compile.tar
 
-      - name: Upload centos8-compile image to artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: centos8-compile
-          path: centos8-compile.tar
+#      - name: Upload centos8-compile image to artifact
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: centos8-compile
+#          path: centos8-compile.tar
 
   single-e2e:
     needs: build
@@ -1156,17 +1156,17 @@ jobs:
         with:
           name: centos7-compile
 
-      - name: Download centos8-compile image
-        uses: actions/Download-artifact@v2
-        with:
-          name: centos8-compile
+#      - name: Download centos8-compile image
+#        uses: actions/Download-artifact@v2
+#        with:
+#          name: centos8-compile
 
       - name: Load Image
         run: |
           docker load --input kube-ovn.tar
           docker load --input vpc-nat-gateway.tar
           docker load --input centos7-compile.tar
-          docker load --input centos8-compile.tar
+          # docker load --input centos8-compile.tar
 
       - name: Security Scan
         run: |
@@ -1177,7 +1177,6 @@ jobs:
           sudo apt-get install trivy
           make scan
 
-
       - name: Push
         if: ${{ github.ref == 'refs/heads/master' || contains(github.ref, 'release') }}
         env:
@@ -1194,14 +1193,14 @@ jobs:
           docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-x86
           docker tag kubeovn/centos7-compile:$TAG kubeovn/centos7-compile-dev:$TAG-x86
           docker tag kubeovn/centos7-compile:$TAG kubeovn/centos7-compile:$TAG-x86
-          docker tag kubeovn/centos8-compile:$TAG kubeovn/centos8-compile-dev:$TAG-x86
-          docker tag kubeovn/centos8-compile:$TAG kubeovn/centos8-compile:$TAG-x86
+          # docker tag kubeovn/centos8-compile:$TAG kubeovn/centos8-compile-dev:$TAG-x86
+          # docker tag kubeovn/centos8-compile:$TAG kubeovn/centos8-compile:$TAG-x86
           docker images
           docker push kubeovn/kube-ovn:$TAG-x86
           docker push kubeovn/kube-ovn-dev:$COMMIT-x86
           docker push kubeovn/vpc-nat-gateway:$TAG-x86
           docker push kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
           docker push kubeovn/centos7-compile:$TAG-x86
           docker push kubeovn/centos7-compile-dev:$TAG-x86
-          docker push kubeovn/centos8-compile:$TAG-x86
-          docker push kubeovn/centos8-compile-dev:$TAG-x86
+          # docker push kubeovn/centos8-compile:$TAG-x86
+          # docker push kubeovn/centos8-compile-dev:$TAG-x86
diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ release: lint build-go
 	docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG) -o type=docker -f dist/images/Dockerfile dist/images/
 	docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 -t $(REGISTRY)/vpc-nat-gateway:$(RELEASE_TAG) -o type=docker -f dist/images/vpcnatgateway/Dockerfile dist/images/vpcnatgateway
 	docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 -t $(REGISTRY)/centos7-compile:$(RELEASE_TAG) -o type=docker -f dist/images/compile/centos7/Dockerfile fastpath/
-	docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 -t $(REGISTRY)/centos8-compile:$(RELEASE_TAG) -o type=docker -f dist/images/compile/centos8/Dockerfile fastpath/
+#	docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 -t $(REGISTRY)/centos8-compile:$(RELEASE_TAG) -o type=docker -f dist/images/compile/centos8/Dockerfile fastpath/
 
 .PHONY: release-arm
 release-arm: build-go-arm
@@ -73,7 +73,7 @@ tar:
 	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG) -o kube-ovn.tar
 	docker save $(REGISTRY)/vpc-nat-gateway:$(RELEASE_TAG) -o vpc-nat-gateway.tar
 	docker save $(REGISTRY)/centos7-compile:$(RELEASE_TAG) -o centos7-compile.tar
-	docker save $(REGISTRY)/centos8-compile:$(RELEASE_TAG) -o centos8-compile.tar
+#	docker save $(REGISTRY)/centos8-compile:$(RELEASE_TAG) -o centos8-compile.tar
 
 .PHONY: base-tar-amd64
 base-tar-amd64: