total rewrite

9 files changed, 150 insertions, 3 deletions

diff --git a/configs/arndale.template b/configs/arndale.template
new file mode 100644
index 0000000..5ab57ad
--- /dev/null
+++ b/configs/arndale.template
@@ -0,0 +1,3 @@
+export git_url=http://git.linaro.org/git/people/christoffer.dall/linux-kvm-arm.git
+export git_branch=kvm-arm-next-arndale
+export kernel_config=arndale_kvm_defconfig
diff --git a/configs/mustang.template b/configs/mustang.template
new file mode 100644
index 0000000..26a31a8
--- /dev/null
+++ b/configs/mustang.template
@@ -0,0 +1,3 @@
+export git_url=https://github.com/AppliedMicro/ENGLinuxLatest.git
+export git_branch=apm_linux_v3.15-rc8
+export kernel_config=xgene_defconfig
diff --git a/configs/vexpress.template b/configs/vexpress.template
new file mode 100644
index 0000000..ce1ea22
--- /dev/null
+++ b/configs/vexpress.template
@@ -0,0 +1,3 @@
+export git_url=https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
+export git_branch=queue
+export kernel_config=vexpress_kvm.config
diff --git a/jenkins-run b/jenkins-run
new file mode 100755
index 0000000..c29f6d9
--- /dev/null
+++ b/jenkins-run
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# jenkins-run
+
+. ./kvm-ci/configs/${hwpack}.template
+
+export parent_workspace="/mnt/ci_build/workspace/linux-kvm"
+export reference_git="${parent_workspace}/reference-git" 
+
+test -d ${reference_git} || time git clone --mirror http://git.linaro.org/git/people/christoffer.dall/linux-kvm-arm.git ${reference_git}
+(cd ${reference_git} && time git fetch)
+time git clone --reference ${reference_git} ${git_url} --branch ${git_branch} build
+
+cp -a kvm-ci build/
+cd build
+bash -x ./kcm-ci/kvm-${hwpack}-host
diff --git a/jenkins-vexpress-commands.sh b/kvm-arm32-guest
index 4fa8929..4fa8929 100755
--- a/jenkins-vexpress-commands.sh
+++ b/kvm-arm32-guest
diff --git a/kvm-arm64-guest b/kvm-arm64-guest
new file mode 100755
index 0000000..3ff9b1e
--- /dev/null
+++ b/kvm-arm64-guest
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+make_qcow() {
+    export ROOTFS_BUILD_URL="http://people.linaro.org/~riku.voipio/trusty-nano-arm64-nfs.tar.gz"
+    wget -nc --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL} -O trusty-nano.tgz
+    dd if=/dev/zero of=kvm.raw bs=1024 seek=1M count=0
+    parted --script kvm.raw mklabel msdos
+    parted --script kvm.raw mkpart p fat32 1 50
+    parted --script  -- kvm.raw mkpart p ext4 51 -0
+    set +e
+    sudo kpartx -a kvm.raw
+    sudo mkfs.vfat /dev/mapper/loop0p1
+    sudo mkfs.ext4 /dev/mapper/loop0p2
+    sudo mount /dev/mapper/loop0p2 /mnt/
+    sudo tar xaf trusty-nano.tgz -C /mnt --strip-components=1
+cat > interfaces << EOF
+# hack By riku 15.1.2014 in jenkins-vexpress-commands.sh
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp
+EOF
+sudo cp interfaces /mnt/etc/network/
+    sudo umount /mnt
+    sudo kpartx -d kvm.raw
+    set -e # ensure proper teardown
+    qemu-img convert -f raw -O qcow2 kvm.raw kvm.qcow2
+    gzip -9 kvm.qcow2
+}
+
+set -e
+sudo apt-get update
+sudo apt-get install -y qemu-utils kpartx
+rm -rf lci-build-tools builddir-*
+rm -f *deb *.gz kvm.raw
+
+make_qcow
+mv kvm.qcow2.gz kvm-arm64.qcow2
+
+cat << EOF > BUILD-INFO.txt
+Format-Version: 0.1
+
+Files-Pattern: *
+License-Type: open
+EOF
diff --git a/jenkins-arndale-commands.sh b/kvm-arndale-host
index cffcf1c..0a631b3 100755
--- a/jenkins-arndale-commands.sh
+++ b/kvm-arndale-host
@@ -1,12 +1,11 @@
 #!/bin/bash
 set -e
-LAVA_NAME=${BUILD_URL:-"arndale-kvm-test"}
+LAVA_NAME=${BUILD_URL:-"linux-kvm-test"}
 
 rm -rf lci-build-tools builddir-* *gz *deb hwpack*
 git clone https://git.linaro.org/ci/lci-build-tools.git
 
 export MAKE_DTBS="true"
-export kernel_config="arndale_kvm_defconfig"
 export make_deb="true"
 export board_type='arndale'
 export hwpack_type='arndale'
@@ -36,7 +35,7 @@ HWPACK_JOB_NAME=linux-kvm-arm/hwpack=arndale
 HWPACK_BUILD_NUMBER=${BUILD_NUMBER}
 HWPACK_FILE_NAME=`ls hwpack_linaro-arndale*.tar.gz`
 DEVICE_TYPE=arndale
-IMAGE_URL=https://snapshots.linaro.org/ubuntu/images/arndale-kvm/${BUILD_NUMBER}/arndale-sd.img.gz
+IMAGE_URL=https://snapshots.linaro.org/ubuntu/images/linux-kvm/${BUILD_NUMBER}/arndale-sd.img.gz
 LAVA_TEST_PLAN=kvm
 GIT_REPO=git://git.linaro.org/qa/test-definitions.git
 BUNDLE_STREAM_NAME=/private/team/linaro/virtualization/
diff --git a/kvm-mustang-host b/kvm-mustang-host
new file mode 100755
index 0000000..20d4cd1
--- /dev/null
+++ b/kvm-mustang-host
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+LAVA_NAME=${BUILD_URL:-"linux-kvm-test"}
+
+rm -rf lci-build-tools builddir-* *gz *deb hwpack*
+git clone https://git.linaro.org/ci/lci-build-tools.git
+
+export MAKE_DTBS="true"
+export ARCH=arm64
+export kernel_config="xgene_defconfig"
+export make_deb="false"
+export board_type='mustang'
+export hwpack_type='mustang'
+export kernel_flavour='mustang'
+export git_reset='no'
+
+# jenkins needs a different directory for build due to git juggling
+if [ ! -z ${WORKSPACE} ]
+then
+    export WORKSPACE=${WORKSPACE}/build
+fi
+./lci-build-tools/jenkins_kernel_build_inst
+
+builddir=`echo builddir-*`
+mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d ${builddir}/arch/arm64/boot/Image ${builddir}/arch/arm64/boot/uImage
+cp ${builddir}/arch/arm64/boot/dts/apm-mustang.dtb ..
+cp ${builddir}/arch/arm64/boot/uImage ..
+cp ${builddir}/arch/arm64/boot/Image ..
+
+cat << EOF > ../BUILD-INFO.txt
+Format-Version: 0.1
+
+Files-Pattern: *
+License-Type: open
+EOF
+
diff --git a/kvm-vexpress-host b/kvm-vexpress-host
new file mode 100755
index 0000000..98fd136
--- /dev/null
+++ b/kvm-vexpress-host
@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e
+LAVA_NAME=${BUILD_URL:-"arndale-kvm-test"}
+
+rm -rf lci-build-tools builddir-* *gz *deb hwpack*
+git clone https://git.linaro.org/ci/lci-build-tools.git
+cp configs/vexpress_kvm.config arch/arm/configs/vexpress_kvm_defconfig
+
+export MAKE_DTBS="true"
+export kernel_config="vexpress_kvm_defconfig"
+export make_deb="true"
+export board_type='vexpress'
+export hwpack_type='vexpress'
+export kernel_flavour='vexpress'
+export git_reset='no'
+
+# jenkins needs a different directory for build due to git juggling
+if [ ! -z ${WORKSPACE} ]
+then
+    export WORKSPACE=${WORKSPACE}/build
+fi
+./lci-build-tools/jenkins_kernel_build_inst
+
+#export ROOTFS_BUILD_URL="http://releases.linaro.org/14.05/ubuntu/trusty-images/developer/linaro-trusty-developer-20140522-661.tar.gz"
+export ROOTFS_BUILD_URL="http://people.linaro.org/~rikuvoipio/trusty.tgz"
+
+wget -nc --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL} -O linaro-trusty-developer.tgz
+
+./linaro-image-tools/linaro-media-create --dev vexpress --output-directory upload-dir-vexpress --image-size 2500M --rootfs ext3 \
+  --binary linaro-trusty-developer.tgz --hwpack hwpack_linaro-vexpress_*.tar.gz --hwpack-force
+
+mv upload-dir-vexpress/sd.img vexpress-sd.img
+gzip -9 arndale-sd.img
+
+cat << EOF > ../BUILD-INFO.txt
+Format-Version: 0.1
+
+Files-Pattern: *
+License-Type: open
+EOF
+