turris: change how we do Turris 4.x

17 files changed, 20 insertions, 15 deletions

diff --git a/jobs/turris4x-mox.conf b/jobs/turris-dragons-mox.conf
index fafbc63..fafbc63 120000
--- a/jobs/turris4x-mox.conf
+++ b/jobs/turris-dragons-mox.conf
diff --git a/jobs/turris4x-mox.env b/jobs/turris-dragons-mox.env
index 73cfdbc..350ce74 100644
--- a/jobs/turris4x-mox.env
+++ b/jobs/turris-dragons-mox.env
@@ -1,3 +1,3 @@
 BOARD=mox
-BRANCH=hbk
+ANIMAL=hbd
 ARCH=aarch64_cortex-a53
diff --git a/jobs/turris-dragons-mox.run b/jobs/turris-dragons-mox.run
new file mode 120000
index 0000000..683ec07
--- /dev/null
+++ b/jobs/turris-dragons-mox.run
@@ -0,0 +1 @@
+../templates/turris.run
\ No newline at end of file
diff --git a/jobs/turris4x-omnia.conf b/jobs/turris-dragons-omnia.conf
index fafbc63..fafbc63 120000
--- a/jobs/turris4x-omnia.conf
+++ b/jobs/turris-dragons-omnia.conf
diff --git a/jobs/turris4x-omnia.env b/jobs/turris-dragons-omnia.env
index 28401f8..daaff0b 100644
--- a/jobs/turris4x-omnia.env
+++ b/jobs/turris-dragons-omnia.env
@@ -1,3 +1,3 @@
 BOARD=omnia
-BRANCH=hbk
+ANIMAL=hbd
 ARCH=arm_cortex-a9_vfpv3
diff --git a/jobs/turris-dragons-omnia.run b/jobs/turris-dragons-omnia.run
new file mode 120000
index 0000000..683ec07
--- /dev/null
+++ b/jobs/turris-dragons-omnia.run
@@ -0,0 +1 @@
+../templates/turris.run
\ No newline at end of file
diff --git a/jobs/turris4x-turris.conf b/jobs/turris-kittens-mox.conf
index fafbc63..fafbc63 120000
--- a/jobs/turris4x-turris.conf
+++ b/jobs/turris-kittens-mox.conf
diff --git a/jobs/turris-kittens-mox.env b/jobs/turris-kittens-mox.env
new file mode 100644
index 0000000..d9adf5f
--- /dev/null
+++ b/jobs/turris-kittens-mox.env
@@ -0,0 +1,3 @@
+BOARD=mox
+ANIMAL=hbk
+ARCH=aarch64_cortex-a53
diff --git a/jobs/turris-kittens-mox.run b/jobs/turris-kittens-mox.run
new file mode 120000
index 0000000..683ec07
--- /dev/null
+++ b/jobs/turris-kittens-mox.run
@@ -0,0 +1 @@
+../templates/turris.run
\ No newline at end of file
diff --git a/jobs/turris-kittens-omnia.conf b/jobs/turris-kittens-omnia.conf
new file mode 120000
index 0000000..fafbc63
--- /dev/null
+++ b/jobs/turris-kittens-omnia.conf
@@ -0,0 +1 @@
+../templates/turris.conf
\ No newline at end of file
diff --git a/jobs/turris-kittens-omnia.env b/jobs/turris-kittens-omnia.env
new file mode 100644
index 0000000..3d6c6bf
--- /dev/null
+++ b/jobs/turris-kittens-omnia.env
@@ -0,0 +1,3 @@
+BOARD=omnia
+ANIMAL=hbk
+ARCH=arm_cortex-a9_vfpv3
diff --git a/jobs/turris-kittens-omnia.run b/jobs/turris-kittens-omnia.run
new file mode 120000
index 0000000..683ec07
--- /dev/null
+++ b/jobs/turris-kittens-omnia.run
@@ -0,0 +1 @@
+../templates/turris.run
\ No newline at end of file
diff --git a/jobs/turris4x-mox.run b/jobs/turris4x-mox.run
deleted file mode 120000
index 4523cf7..0000000
--- a/jobs/turris4x-mox.run
+++ /dev/null
@@ -1 +0,0 @@
-../templates/turris4x.run
\ No newline at end of file
diff --git a/jobs/turris4x-omnia.run b/jobs/turris4x-omnia.run
deleted file mode 120000
index 4523cf7..0000000
--- a/jobs/turris4x-omnia.run
+++ /dev/null
@@ -1 +0,0 @@
-../templates/turris4x.run
\ No newline at end of file
diff --git a/jobs/turris4x-turris.env b/jobs/turris4x-turris.env
deleted file mode 100644
index b490946..0000000
--- a/jobs/turris4x-turris.env
+++ /dev/null
@@ -1,3 +0,0 @@
-BOARD=turris
-BRANCH=hbk
-ARCH=powerpc_8540
diff --git a/jobs/turris4x-turris.run b/jobs/turris4x-turris.run
deleted file mode 120000
index 4523cf7..0000000
--- a/jobs/turris4x-turris.run
+++ /dev/null
@@ -1 +0,0 @@
-../templates/turris4x.run
\ No newline at end of file
diff --git a/templates/turris4x.run b/templates/turris.run
index 96b4497..5f4aeb3 100755
--- a/templates/turris4x.run
+++ b/templates/turris.run
@@ -8,7 +8,7 @@ else
 	make="make -j4 IS_TTY=1 BUILD_LOG=1"
 fi
 
-curl "https://repo.turris.cz/$BRANCH/packages/$BOARD/git-hash" > git-hash
+curl "https://repo.turris.cz/$ANIMAL/packages/$BOARD/git-hash" > git-hash
 cat git-hash
 # TODO take lock so we won't run multiple instances of new builds
 if [ -z "$CLEAN" ] && [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
@@ -30,7 +30,7 @@ DL_MIRROR="$TWORKSPACE/openwrt-dl-mirror"
 CCACHE_HOST_DIR="$TWORKSPACE/ccache-host"
 CCACHE_TARGET_DIR="$WORKSPACE/ccache-target"
 EOF
-	../turris-build/compile_pkgs -e -t "$BOARD" -p "$BRANCH" repo_prepare autopkg
+	../turris-build/compile_pkgs -e -t "$BOARD" -p "$ANIMAL" repo_prepare autopkg
 	$make toolchain/compile target/compile package/usign/host/compile
 	)
 	tar -czf openwrt.tar.gz openwrt
@@ -53,10 +53,10 @@ echo_stage "Generate index and sign"
 $make package/index BUILD_KEY=~/openwrt-repo.key
 
 echo_stage "Deploy"
-ssh upload rm -rf "deploy-turris4x-$BOARD"
-scp -r "bin/packages/$ARCH/personal" upload:deploy-turris4x-$BOARD
+ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
+scp -r "bin/packages/$ARCH/personal" upload:deploy-turris-$BOARD
 ssh upload /bin/sh -e <<EOF
-	mkdir -p /var/www/repo/turris4x
-	rm -rf /var/www/repo/turris4x/$BOARD
-	mv deploy-turris4x-$BOARD /var/www/repo/turris4x/$BOARD
+	mkdir -p "/var/www/repo/turris/$ANIMAL"
+	rm -rf "/var/www/repo/turris/$ANIMAL/$BOARD"
+	mv deploy-turris-$ANIMAL-$BOARD "/var/www/repo/turris/$ANIMAL/$BOARD"
 EOF