aboutsummaryrefslogtreecommitdiff
path: root/jenkins
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@collabora.com>2019-06-10 18:20:02 +0100
committerGuillaume Tucker <guillaume.tucker@collabora.com>2019-06-14 13:47:04 +0100
commit0bc9dffbdee9b0d40cce2914bab5e445bbb8abb9 (patch)
treec441c61d19c117ecd8e2d39473548dbc57f61d76 /jenkins
parentef6fb32987dfd4f7d90a15fc449401b97149cefe (diff)
debos: run step to remove extra packages after strip.sh
Move the step to remove any extra packages after running strip.sh as it expects some packages to still be there and doesn't remove the Debian tools. This avoids failures to run strip.sh regardless of which extra packages are being removed. Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'jenkins')
-rw-r--r--jenkins/debian/debos/rootfs.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/jenkins/debian/debos/rootfs.yaml b/jenkins/debian/debos/rootfs.yaml
index ffb393b..c72685a 100644
--- a/jenkins/debian/debos/rootfs.yaml
+++ b/jenkins/debian/debos/rootfs.yaml
@@ -137,16 +137,16 @@ actions:
chroot: false
command: mv ${ROOTDIR}/boot/initrd.img-min ${ARTIFACTDIR}/{{ $basename -}}/initrd.cpio.gz
-{{ if $extra_packages_remove }}
- action: run
- description: remove extra packages
chroot: true
- command: dpkg --purge --force-remove-essential --force-depends {{ $extra_packages_remove }}
-{{ end }}
+ script: scripts/strip.sh
+{{ if $extra_packages_remove }}
- action: run
+ description: remove extra packages
chroot: true
- script: scripts/strip.sh
+ command: dpkg --purge --force-remove-essential --force-depends {{ $extra_packages_remove }}
+{{ end }}
- action: run
chroot: true