Skip to content
Snippets Groups Projects
Unverified Commit f4207334 authored by Andrej Shadura's avatar Andrej Shadura
Browse files

Drop curl and unzip usage


We can use busybox wget instead of curl to avoid installing extra
packages which is not possible with ostree images.

Signed-off-by: default avatarAndrej Shadura <andrew.shadura@collabora.co.uk>
parent 4e1986fa
No related branches found
No related tags found
1 merge request!606Build custom ostree images for package-centric testing
...@@ -17,25 +17,16 @@ job_name: Run {% raw %}{{job.PACKAGE}}{% endraw %}-in-{{image_name}} ...@@ -17,25 +17,16 @@ job_name: Run {% raw %}{{job.PACKAGE}}{% endraw %}-in-{{image_name}}
name: "Install {% raw %}{{job.PACKAGE}}{% endraw %} from GitLab" name: "Install {% raw %}{{job.PACKAGE}}{% endraw %} from GitLab"
run: run:
steps: steps:
- # enable development repo
- grep "deb .* {{release_version}} target" /etc/apt/sources.list | head -1 | sed "s/target/development/g" >> /etc/apt/sources.list
{%- if arch == 'arm64' %}
- # correct time-zone on target else apt is not working
- timedatectl set-timezone Europe/Berlin
- systemctl daemon-reload
- #systemctl restart systemd-timesyncd
{%- endif %}
- apt update -q && apt install curl unzip -q -y
- | - |
curl -H "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \ busybox wget --header "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \
-O {% raw %}{{job.BUILD_RESULTS_URL}}{% endraw %}/artifacts-list.txt {% raw %}{{job.BUILD_RESULTS_URL}}{% endraw %}/artifacts-list.txt
- BIN_PKG_LIST="{{BIN_PKG_LIST}}" - BIN_PKG_LIST="{{BIN_PKG_LIST}}"
- | - |
for DEB in ${BIN_PKG_LIST} for DEB in ${BIN_PKG_LIST}
do do
DEB_PATH=$(grep "${DEB}_.*_{{arch}}\.deb$" artifacts-list.txt) DEB_PATH=$(grep "${DEB}_.*_{{arch}}\.deb$" artifacts-list.txt)
curl -H "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \ busybox wget --header "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \
-O {% raw %}{{job.BUILD_RESULTS_URL}}{% endraw %}/${DEB_PATH} {% raw %}{{job.BUILD_RESULTS_URL}}{% endraw %}/${DEB_PATH}
done done
- sudo apt install ./*.deb -q -y - sudo apt install ./*.deb -q -y
from: inline from: inline
...@@ -48,8 +39,8 @@ job_name: Run {% raw %}{{job.PACKAGE}}{% endraw %}-in-{{image_name}} ...@@ -48,8 +39,8 @@ job_name: Run {% raw %}{{job.PACKAGE}}{% endraw %}-in-{{image_name}}
run: run:
steps: steps:
- | - |
curl -H "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \ busybox wget --header "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \
-O {% raw %}{{job.SOURCE_RESULTS_URL}}{% endraw %} {% raw %}{{job.SOURCE_RESULTS_URL}}{% endraw %}
- | - |
find . -name "{% raw %}{{job.PACKAGE}}{% endraw %}_*.debian.tar.*" -type f \ find . -name "{% raw %}{{job.PACKAGE}}{% endraw %}_*.debian.tar.*" -type f \
-exec tar -xvf {} \; -exec tar -xvf {} \;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment