updated testing to build odp

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

6 files changed, 79 insertions, 33 deletions

diff --git a/execs/dpdk_all_archs.yaml b/execs/dpdk_all_archs.yaml
deleted file mode 100644
index 8bdd4f6..0000000
--- a/execs/dpdk_all_archs.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-metadata:
-  name: Build DPDK
-  format: "Lava-Test-Shell Test Definition 1.0"
-  description: "Build DPDK"
-  version: 1.0
-
-install:
-    deps:
-        - libnuma1
-        - libnuma-dev
-        - libpcap-dev
-        #- wget
-
-run:
-    steps:
-        - echo "Build DPDK"
-        - ./scripts/build-dpdk.sh
diff --git a/execs/odp-build.yaml b/execs/odp-build.yaml
new file mode 100644
index 0000000..dcd2d80
--- /dev/null
+++ b/execs/odp-build.yaml
@@ -0,0 +1,28 @@
+metadata:
+  name: ODP installation
+  format: "Lava-Test-Shell Test Definition 1.0"
+  description: "Setup ODP"
+  version: 1.0
+
+install:
+    deps:
+        - autotools-dev
+        - autoconf
+        - libtool
+        - autogen
+        - gcc
+        - git
+        - g++
+        - make
+        - libssl-dev
+        - libcunit1
+        - libcunit1-dev
+        - libconfig-dev
+        - m4
+        - pkg-config
+        - locales-all
+
+run:
+    steps:
+        - echo "Build ODP"
+        - ./scripts/build-odp.sh
diff --git a/multinodes/testing.yaml b/multinodes/testing.yaml
index 1115c76..2b0c40e 100644
--- a/multinodes/testing.yaml
+++ b/multinodes/testing.yaml
@@ -23,7 +23,7 @@ protocols:
                 device_type: x86
                 count: 1
                 context:
-                    extra_kernel_args: default_hugepagesz=2M hugepagesz=1G hugepages=1 hugepagesz=2M hugepages=1024 intel_iommu=on iommu=on
+                    extra_kernel_args: default_hugepagesz=2M hugepagesz=1G hugepages=1 hugepagesz=2M hugepages=1024
     lava-vland:
         thunderx:
             vlan_one:
@@ -57,6 +57,7 @@ actions:
         lava-vland:
             - action: lava-vland-overlay
               request: deploy_vlans
+
 - deploy:
     role:
         - lng03
@@ -78,7 +79,6 @@ actions:
             - action: lava-vland-overlay
               request: deploy_vlans
 
-
 - boot:
     role:
         - thunderx
@@ -112,17 +112,21 @@ actions:
         minutes: 900
 
     definitions:
-        - repository: https://git.linaro.org/people/ilias.apalodimas/lava-sessions.git/
+        - repository: https://github.com/Linaro/odp-ci-lava.git
           from: git
           path: execs/ubuntu-build-essential.yaml
           name: ubuntu-build-essential
-        
+
+        - repository: https://github.com/Linaro/odp-ci-lava.git
+          from: git
+          path: execs/dpdk-build.yaml
+          name: build-DPDK
+
         - repository: https://git.linaro.org/people/ilias.apalodimas/lava-sessions.git/
           from: git
-          path: execs/dpdk_all_archs.yaml
-          name: dpdk-build
+          path: execs/odp-build.yaml
+          name: build-ODP
 
- 
         - repository: https://git.linaro.org/lava-team/hacking-session.git
           from: git
           path: hacking-session-debian.yaml
diff --git a/scripts/build-dpdk.sh b/scripts/build-dpdk.sh
index ca8c626..2702402 100755
--- a/scripts/build-dpdk.sh
+++ b/scripts/build-dpdk.sh
@@ -1,20 +1,13 @@
 #!/bin/sh
 
+. ./lava-comon.sh
+
 DPDK_VER='17.11.1'
 DPDK_DIR='dpdk_source'
 DPDK_STATIC_TAR='dpdk.tar.xz'
 
 arch=$(arch)
 
-dpdk_lava_result() {
-	reason=$1
-	result=$2
-	stop_session=$3
-
-	lava-test-case "$reason" --result "$result"
-	[ "$stop_session" = 'yes' ] && lava-test-raise "$reason" && exit 1
-}
-
 wget https://fast.dpdk.org/rel/dpdk-"$DPDK_VER".tar.xz -O "$DPDK_STATIC_TAR" && \
 	mkdir "$DPDK_DIR" && tar xf "$DPDK_STATIC_TAR" --strip 1 -C "$DPDK_DIR"
 
@@ -38,3 +31,4 @@ esac
 cd "$DPDK_DIR"
 make -j "$cjobs" install T="$dpdk_t" DESTDIR=./install
 cd ..
+dpdk_lava_result 'DPDK_BUILD' 'OK' 'no'
diff --git a/scripts/build-odp.sh b/scripts/build-odp.sh
new file mode 100755
index 0000000..ecaa636
--- /dev/null
+++ b/scripts/build-odp.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+ODP_VER='master'
+ODP_CONF_OPTS='--enable-debug --enable-debug-print --prefix=./install'
+
+git clone https://github.com/Linaro/odp.git && cd odp && git checkout master
+# terminate LAVA job if download failed
+[ $? -ne 0 ] && dpdk_lava_result 'ODP_DOWNLOAD' 'FAILED' 'yes'
+
+# we usually run on Xeon/Thunderx, aadjust accordingly for future archs
+arch=$(arch)
+case $arch in
+	aarch64)
+		cjobs=98
+		;;
+	x86_64)
+		cjobs=24
+		;;
+	*) 
+		dpdk_lava_result 'BUILD_ARCH' 'UNKNOWN_ARCH' 'yes'
+esac
+
+# already cd'ed in
+./bootstrap
+autoreconf -i
+./configure --enable-debug --enable-debug-print --prefix=$BUILD_DIR
+make -j $cjobs install
diff --git a/scripts/lava-common.sh b/scripts/lava-common.sh
new file mode 100755
index 0000000..331db0f
--- /dev/null
+++ b/scripts/lava-common.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+dpdk_lava_result() {
+	reason=$1
+	result=$2
+	stop_session=$3
+
+	lava-test-case "$reason" --result "$result"
+	[ "$stop_session" = 'yes' ] && lava-test-raise "$reason" && exit 1
+}