Add static checks for ppc64le

Amulyam24 · Jan 3, 2024 · cdcaf84 · cdcaf84
1 parent 3833bda
commit cdcaf84
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml
@@ -78,6 +78,7 @@ jobs:
           - "ubuntu-20.04"
           - "arm-no-k8s"
           - "s390x"
+          - "ppc64le"
     runs-on: ${{ matrix.instance }}
     steps:
       - name: Adjust a permission for repo

diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile
@@ -6,9 +6,9 @@ include ../../utils.mk
 
 PROJECT_DIRS := $(shell find . -name Cargo.toml -printf '%h\n' | sort -u)
 
-ifeq ($(ARCH), s390x)
+ifeq ($(ARCH), $(filter $(ARCH), s390x ppc64le))
 default build check test clippy vendor:
-	@echo "s390x not support currently"
+	@echo "$(ARCH) is not support currently"
 	exit 0
 else
 

diff --git a/src/runtime/cmd/kata-runtime/kata-env_ppc64le_test.go b/src/runtime/cmd/kata-runtime/kata-env_ppc64le_test.go
@@ -9,7 +9,7 @@ import "testing"
 
 func getExpectedHostDetails(tmpdir string) (HostInfo, error) {
 	expectedVendor := ""
-	expectedModel := "POWER8"
+	expectedModel := "POWER9"
 	expectedVMContainerCapable := true
 	return genericGetExpectedHostDetails(tmpdir, expectedVendor, expectedModel, expectedVMContainerCapable)
 }

diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile
@@ -7,7 +7,7 @@ include ../../../utils.mk
 
 ifeq ($(ARCH), ppc64le)
      override ARCH = powerpc64le
- endif
+endif
 
 .DEFAULT_GOAL := default
 default: build

diff --git a/src/tools/kata-ctl/Cargo.toml b/src/tools/kata-ctl/Cargo.toml
@@ -59,10 +59,10 @@ csv = "1.2"
 serde_with = "2.3"
 chrono = { version = "0.4", features = ["serde"]}
 
-[target.'cfg(target_arch = "s390x")'.dependencies]
+[target.'cfg(target_arch = "powerpc64le")'.dependencies]
 reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "native-tls"] }
 
-[target.'cfg(not(target_arch = "s390x"))'.dependencies]
+[target.'cfg(not(target_arch = "powerpc64le"))'.dependencies]
 reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "rustls-tls"] }
 
 [dev-dependencies]

diff --git a/src/tools/kata-ctl/Makefile b/src/tools/kata-ctl/Makefile
@@ -5,6 +5,10 @@
 
 include ../../../utils.mk
 
+ifeq ($(ARCH), ppc64le)
+    override ARCH = powerpc64le
+endif
+
 PROJECT_NAME = Kata Containers
 PROJECT_URL = https://github.com/kata-containers
 PROJECT_COMPONENT = kata-ctl
@@ -36,7 +40,7 @@ default: $(TARGET) build
 
 $(TARGET): $(GENERATED_CODE)
 
-build:
+build: update
 	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES)
 
 static-checks-build: $(GENERATED_CODE)

diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile
@@ -10,7 +10,7 @@ include ../../../utils.mk
 
 ifeq ($(ARCH), ppc64le)
      override ARCH = powerpc64le
- endif
+endif
 
 TARGET = runk
 TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)

diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile
@@ -7,7 +7,7 @@ include ../../../utils.mk
 
 ifeq ($(ARCH), ppc64le)
      override ARCH = powerpc64le
- endif
+endif
 
 .DEFAULT_GOAL := default
 default: build