summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-01-15 11:15:05 +0100
committerPatrick Vacek <patrickvacek@gmail.com>2020-01-15 12:24:05 +0100
commit73d0471162a54c1737db6622781a3713a8bad61f (patch)
treeda6843b987be1eb584113f55d59d4ac2c77ba7aa
parenta6ef1ed2784fde198baef0e6b12e4b0d86e8bb66 (diff)
downloadmeta-updater-73d0471162a54c1737db6622781a3713a8bad61f.tar.gz
gitla-ci.yml: Bring in line with other branches.
There were some small differences, probably due to this coming from the master version, and I guess we never explicitly compared it to the others. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--.gitlab-ci.yml13
1 files changed, 2 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c201e3b..141a9f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,10 +43,6 @@ Build core-image-minimal:
43 variables: 43 variables:
44 TEST_BUILD_DIR: 'build-core-image-minimal' 44 TEST_BUILD_DIR: 'build-core-image-minimal'
45 BITBAKE_TARGETS: 'core-image-minimal' 45 BITBAKE_TARGETS: 'core-image-minimal'
46 artifacts:
47 name: "core-image-minimal_$CI_COMMIT_REF_SLUG"
48 paths:
49 - $TEST_BUILD_DIR/tmp/deploy/images/*/core-image-minimal*
50 except: 46 except:
51 - pushes 47 - pushes
52 48
@@ -58,10 +54,6 @@ Build core-image-minimal (rpi):
58 TEST_BUILD_DIR: 'build-core-image-minimal-rpi' 54 TEST_BUILD_DIR: 'build-core-image-minimal-rpi'
59 BITBAKE_TARGETS: 'core-image-minimal' 55 BITBAKE_TARGETS: 'core-image-minimal'
60 TEST_MACHINE: 'raspberrypi3' 56 TEST_MACHINE: 'raspberrypi3'
61 artifacts:
62 name: "core-image-minimal-rpi_$CI_COMMIT_REF_SLUG"
63 paths:
64 - $TEST_BUILD_DIR/tmp/deploy/images/*/core-image-minimal*
65 except: 57 except:
66 - pushes 58 - pushes
67 59
@@ -94,9 +86,8 @@ Oe-selftest rpi:
94 OE_SELFTESTS: 'updater_raspberrypi' 86 OE_SELFTESTS: 'updater_raspberrypi'
95 except: 87 except:
96 - pushes 88 - pushes
97 only: 89
98 variables: 90# Not run by default
99 - $OE_RPI
100 91
101Ptest qemux86_64: 92Ptest qemux86_64:
102 extends: .oe-selftest 93 extends: .oe-selftest