Commit aa037c5b authored by Stephan's avatar Stephan
Browse files

gitlabci-fixes

parent 5f4581ff
Pipeline #2227 passed with stages
in 104 minutes and 44 seconds
......@@ -27,7 +27,7 @@ m3:init:
- test "${FF_GITLAB_REMOVE_WORKDIR}" = "1" && rm -rf ~/mycache/workdir/*
- /bin/true
tags:
- m3runner
- m3runner
m3:ar71xx.tiny.lowmem:
only:
......@@ -39,7 +39,7 @@ m3:ar71xx.tiny.lowmem:
- ln -s ~/mycache/workdir
- ./build.sh ar71xx.tiny.lowmem rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:ar71xx.generic.lowmem:
only:
......@@ -51,7 +51,7 @@ m3:ar71xx.generic.lowmem:
- ln -s ~/mycache/workdir
- ./build.sh ar71xx.generic.lowmem rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:x86.64.offloader:
only:
......@@ -63,7 +63,7 @@ m3:x86.64.offloader:
- ln -s ~/mycache/workdir
- ./build.sh x86.64.offloader rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:ramips:
only:
......@@ -75,7 +75,7 @@ m3:ramips:
- ln -s ~/mycache/workdir
- ./build.sh ramips.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:ipq40xx:
only:
......@@ -87,7 +87,7 @@ m3:ipq40xx:
- ln -s ~/mycache/workdir
- ./build.sh ipq40xx.generic.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:lantiq:
only:
......@@ -99,7 +99,7 @@ m3:lantiq:
- ln -s ~/mycache/workdir
- ./build.sh lantiq.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:ath79:
only:
......@@ -111,7 +111,7 @@ m3:ath79:
- ln -s ~/mycache/workdir
- ./build.sh ath79.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:sunxi:
only:
......@@ -123,7 +123,7 @@ m3:sunxi:
- ln -s ~/mycache/workdir
- ./build.sh sunxi.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:mpc85xx:
only:
......@@ -135,7 +135,7 @@ m3:mpc85xx:
- ln -s ~/mycache/workdir
- ./build.sh mpc85xx.* rerun -j"$(( $(nproc) + 1))"
tags:
- m3runner
- m3runner
m3:test:
only:
......@@ -147,7 +147,7 @@ m3:test:
- ln -s ~/mycache/workdir
- ./build.sh list
tags:
- m3runner
- m3runner
m3:upload:
only:
......@@ -159,16 +159,13 @@ m3:upload:
- ln -s ~/mycache/dl
- ln -s ~/mycache/workdir
- ./gen-upload.sh all
# gitlab-runner's public ssh key must added to /home/deploy-firmware/.ssh/authorized_keys.
# On download server there is a user "deploy-firmware" who owns the download directories.
- ([ -n "${FF_UPLOAD_DIR}" ] && rsync -avz --info=all1 --delete -EH --progress final_output/*/* deploy-firmware@download.intern:/var/www/files/firmware/${FF_UPLOAD_DIR}/)
- rm -rf final_output
- |
# gitlab-runner's public ssh key must added to /home/deploy-firmware/.ssh/authorized_keys.
# On download server there is a user "deploy-firmware" who owns the download directories.
if [ -n "${FF_UPLOAD_DIR}" ]; then
rsync -avz --info=all1 --delete -EH --progress final_output/*/* deploy-firmware@download.intern:/var/www/files/firmware/${FF_UPLOAD_DIR}/
fi
rm -rf final_output
# artifacts are not needed (waste of disk storage), because they are uploaded to download server
# artifacts:
# name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
# expire_in: 2 days
# paths:
# - dl
# - final_output
tags:
- m3runner
......@@ -196,5 +196,6 @@ m3tags:upload:
rsync -avz --info=all1 --delete -EH --progress final_output/*/* deploy-firmware@download.intern:/var/www/files/firmware/${FF_UPLOAD_DIR}/
fi
rm -rf final_output
# artifacts are not needed (waste of disk storage), because they are uploaded to download server
tags:
- m3runner
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment