build: run build sanity for various archs

Performs builds across various archs to make sure build sanity is
maintained across archs

Signed-off-by: Aditya R <arajan@redhat.com>

Author: flouthoc

.cirrus.yml

@@ -17,7 +17,7 @@ env:
     # Save a little typing (path relative to $CIRRUS_WORKING_DIR)
     SCRIPT_BASE: "./contrib/cirrus"
     FEDORA_NAME: "fedora-35"
-    IMAGE_SUFFIX: "c4560539387953152"
+    IMAGE_SUFFIX: "c6118659411148800"
     FEDORA_NETAVARK_IMAGE: "fedora-netavark-${IMAGE_SUFFIX}"
 
 
@@ -113,6 +113,15 @@ unit_task:
   setup_script: *setup
   main_script: *main
 
+build_cross_task:
+  alias: "build_cross"
+  depends_on:
+    - "build"
+  cargo_cache: *ro_cargo_cache
+  targets_cache: *ro_targets_cache
+  bin_cache: *ro_bin_cache
+  setup_script: *setup
+  main_script: *main
 
 integration_task:
   alias: "integration"
@@ -152,6 +161,7 @@ success_task:
   alias: success
   depends_on:
     - "build"
+    - "build_cross"
     - "validate"
     - "verify_vendor"
     - "unit"

Makefile

@@ -75,6 +75,15 @@ test: unit integration
 build_unit: $(CARGO_TARGET_DIR)
 	cargo test --no-run
 
+# Test build cross-architecture
+.PHONY: build_cross
+build_cross: $(CARGO_TARGET_DIR)
+	cargo install cross
+	rustup target add aarch64-unknown-linux-gnu
+	rustup target add arm-unknown-linux-gnueabi
+	cross build --target aarch64-unknown-linux-gnu
+	cross build --target arm-unknown-linux-gnueabi
+
 .PHONY: unit
 unit: $(CARGO_TARGET_DIR)
 	cargo test

contrib/cirrus/lib.sh

@@ -29,10 +29,9 @@ SECRET_ENV_RE='(ACCOUNT)|(GC[EP]..+)|(SSH)|(PASSWORD)|(TOKEN)'
 if [[ -r "/etc/ci_environment" ]]; then
     source /etc/ci_environment
 else  # set default values - see make_cienv() below
-    # Install rust packages globally instead of per-user
-    CARGO_HOME="${CARGO_HOME:-/usr/local/cargo}"
-    # Ensure cargo packages can be executed
-    PATH="$PATH:$CARGO_HOME/bin"
+    # VM Images are built with this setup
+    CARGO_HOME="${CARGO_HOME:-/var/cache/cargo}"
+    source $CARGO_HOME/env
 fi
 
 # END Global export of all variables

contrib/cirrus/runner.sh

@@ -35,9 +35,15 @@ EOF
 }
 
 _run_validate() {
+    rustup install stable
+    rustup default stable
     make validate
 }
 
+_run_build_cross() {
+    make build_cross
+}
+
 _run_verify_vendor() {
     # N/B: current repo. dir. contents produced by _run_build() above.
     if ! git diff --no-ext-diff --quiet --exit-code; then

contrib/cirrus/setup.sh

@@ -14,7 +14,17 @@ if [[ -r "/etc/ci_environment" ]]; then
 fi
 trap "complete_setup" EXIT
 
+
 msg "************************************************************"
 msg "Setting up runtime environment"
 msg "************************************************************"
+
+dnf -y install make automake gcc gcc-c++ kernel-devel
+
 show_env_vars
+
+if [[ "$CIRRUS_TASK_NAME" == "build_cross" ]]; then
+	# Setup short-name for rustembedded/cross
+	# TODO: We can move this to quay.io if we reach rate-limits, hopefully that's not gonna happen for netavark
+	echo '  "rustembedded/cross" = "docker.io/rustembedded/cross"'  >> /etc/containers/registries.conf.d/000-shortnames.conf
+fi