btrfs-progs: ci: fix docker test entry point scripts

There was a bug when a branch contained a slash then the file with
downloaded sources was not found. Update all, all images have to be
rebuilt and pushed to docker hub so the changes are applied inside
github actions.

Signed-off-by: David Sterba <dsterba@suse.com>

9 files changed, 41 insertions, 33 deletions

diff --git a/ci/images/ci-centos-7-x86_64/test-build b/ci/images/ci-centos-7-x86_64/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-centos-7-x86_64/test-build
+++ b/ci/images/ci-centos-7-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-centos-8-x86_64/test-build b/ci/images/ci-centos-8-x86_64/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-centos-8-x86_64/test-build
+++ b/ci/images/ci-centos-8-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-musl-i386/docker-build b/ci/images/ci-musl-i386/docker-build
index 5e80d8c5..be38288c 100755
--- a/ci/images/ci-musl-i386/docker-build
+++ b/ci/images/ci-musl-i386/docker-build
@@ -8,4 +8,4 @@ image=$(basename `pwd` | tr '[A-Z]' '[a-z]')
 # Make sure the file exists as it's required but can be empty. In that case
 # it's downloaded when ./test-build is executed
 touch devel.tar.gz
-docker buildx build --platform linux/386 -t "$prefix/$image" .
+docker build --platform linux/386 -t "$prefix/$image" .
diff --git a/ci/images/ci-musl-i386/test-build b/ci/images/ci-musl-i386/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-musl-i386/test-build
+++ b/ci/images/ci-musl-i386/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-musl-x86_64/test-build b/ci/images/ci-musl-x86_64/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-musl-x86_64/test-build
+++ b/ci/images/ci-musl-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-openSUSE-Leap-15.3-x86_64/test-build b/ci/images/ci-openSUSE-Leap-15.3-x86_64/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-openSUSE-Leap-15.3-x86_64/test-build
+++ b/ci/images/ci-openSUSE-Leap-15.3-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build b/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build
index 64fee170..54559461 100755
--- a/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build
+++ b/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/ci-openSUSE-tumbleweed-x86_64/test-build b/ci/images/ci-openSUSE-tumbleweed-x86_64/test-build
index f1a19849..0aea796f 100755
--- a/ci/images/ci-openSUSE-tumbleweed-x86_64/test-build
+++ b/ci/images/ci-openSUSE-tumbleweed-x86_64/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -18,10 +19,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"
diff --git a/ci/images/test-build b/ci/images/test-build
index 64fee170..54559461 100755
--- a/ci/images/test-build
+++ b/ci/images/test-build
@@ -3,8 +3,9 @@
 
 urlbase="https://github.com/kdave/btrfs-progs/archive"
 branch=${1:-devel}
-fname="${branch}.tar.gz"
-url="${urlbase}/${fname}"
+fnbase="${branch/\//-}"
+fname="${fnbase}.tar.gz"
+url="${urlbase}/${branch}.tar.gz"
 
 shift
 
@@ -13,10 +14,10 @@ cd /tmp
 if [ -f "$fname" -a -s "$fname" ]; then
 	echo "Found local file $fname, not downloading"
 else
-	echo "Missing or empty tar, downloading devel branch from git"
+	echo "Missing or empty tar, downloading branch $branch from git"
 	rm -- "$fname"
 	wget "$url" -O "$fname"
 fi
 tar xf "$fname"
-cd "btrfs-progs-$branch"
+cd "btrfs-progs-$fnbase"
 ci/build-default "$@"