Merge pull request #252 from flouthoc/test-rust-cross-build

build: run build sanity for various architecture

Author: openshift-merge-robot

.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

src/commands/teardown.rs

@@ -48,7 +48,7 @@ impl Teardown {
 
         if Path::new(&aardvark_bin).exists() {
             // stop dns server first before netavark clears the interface
-            let path = Path::new(&config_dir).join("aardvark-dns".to_string());
+            let path = Path::new(&config_dir).join("aardvark-dns");
             if let Ok(path_string) = path.into_os_string().into_string() {
                 let mut aardvark_interface = Aardvark::new(path_string, rootless, aardvark_bin);
                 if let Err(er) =

src/dns/aardvark.rs

@@ -45,21 +45,18 @@ impl Aardvark {
 
     // On success retuns aardvark server's pid or returns -1;
     fn get_aardvark_pid(&mut self) -> i32 {
-        let pid: i32;
-        let path = Path::new(&self.config).join("aardvark.pid".to_string());
-        match fs::read_to_string(&path) {
-            Ok(content) => {
-                pid = match content.parse::<i32>() {
-                    Ok(val) => val,
-                    Err(_) => {
-                        return -1;
-                    }
+        let path = Path::new(&self.config).join("aardvark.pid");
+        let pid: i32 = match fs::read_to_string(&path) {
+            Ok(content) => match content.parse::<i32>() {
+                Ok(val) => val,
+                Err(_) => {
+                    return -1;
                 }
-            }
+            },
             Err(_) => {
                 return -1;
             }
-        }
+        };
 
         pid
     }
@@ -161,14 +158,13 @@ impl Aardvark {
     }
 
     pub fn commit_entry(&mut self, entry: AardvarkEntry) -> Result<()> {
-        let data: String;
+        let mut data: String;
         let path = Path::new(&self.config).join(entry.network_name);
         let file_exists = path.exists();
         let mut file = OpenOptions::new().append(true).create(true).open(&path)?;
         // check if this is the first container in this network
         if !file_exists {
             // write first line as gateway ip
-            let data: String;
             if !entry.network_gateway_v4.is_empty() && !entry.network_gateway_v6.is_empty() {
                 data = format!(
                     "{},{}\n",

src/network/core.rs

@@ -535,7 +535,7 @@ impl Core {
                         &container_macvlan_clone,
                         netns_ipaddr_clone,
                         gw_ipaddr,
-                        &"".to_string(), // do we want static mac support for macvlan ? probably later.
+                        "", // do we want static mac support for macvlan ? probably later.
                     ) {
                         return Err(err);
                     }

src/network/core_utils.rs

@@ -145,12 +145,9 @@ impl CoreUtils {
 
         tokio::spawn(connection);
 
-        let master_index: u32;
-
         let mut links = handle.link().get().match_name(ifname.to_string()).execute();
-        match links.try_next().await {
-            Ok(Some(msg)) => master_index = msg.header.index,
-
+        let master_index: u32 = match links.try_next().await {
+            Ok(Some(msg)) => msg.header.index,
             Ok(None) => {
                 return Err(std::io::Error::new(
                     std::io::ErrorKind::Other,
@@ -166,7 +163,7 @@ impl CoreUtils {
                     format!("Unable to resolve bridge interface {}: {}", ifname, err),
                 ));
             }
-        }
+        };
 
         let mut links = handle
             .link()