diff options
-rw-r--r-- | .gitlab-ci.yml | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b22e20..d08a7e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -4,21 +4,24 @@ stages: | |||
4 | - test | 4 | - test |
5 | 5 | ||
6 | variables: | 6 | variables: |
7 | BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-bitbake | 7 | BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-bitbake |
8 | BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-checkout | 8 | BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-checkout |
9 | 9 | ||
10 | include: | 10 | include: |
11 | - local: "scripts/ci/gitlab/docker.yml" | 11 | - project: 'olp/edge/ota/connect/client/meta-updater' |
12 | - local: "scripts/ci/gitlab/checkout.yml" | 12 | ref: 'master' |
13 | - local: "scripts/ci/gitlab/tests.yml" | 13 | file: 'scripts/ci/gitlab/docker.yml' |
14 | - project: 'olp/edge/ota/connect/client/meta-updater' | ||
15 | ref: 'master' | ||
16 | file: 'scripts/ci/gitlab/checkout.yml' | ||
17 | - project: 'olp/edge/ota/connect/client/meta-updater' | ||
18 | ref: 'master' | ||
19 | file: 'scripts/ci/gitlab/tests.yml' | ||
14 | 20 | ||
15 | Docker setup: | 21 | Docker setup: |
16 | extends: .bb_docker_local | 22 | extends: .bb_docker_remote |
17 | 23 | ||
18 | stage: docker | 24 | stage: docker |
19 | variables: | ||
20 | BITBKAE_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-bitbake | ||
21 | BITBAKE_CHECKOUT_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-checkout | ||
22 | except: | 25 | except: |
23 | - pushes | 26 | - pushes |
24 | 27 | ||
@@ -27,7 +30,7 @@ Checkout: | |||
27 | 30 | ||
28 | stage: checkout | 31 | stage: checkout |
29 | variables: | 32 | variables: |
30 | MANIFEST: master | 33 | MANIFEST: warrior |
31 | CURRENT_PROJECT: meta-updater | 34 | CURRENT_PROJECT: meta-updater |
32 | except: | 35 | except: |
33 | - pushes | 36 | - pushes |
@@ -39,10 +42,6 @@ Build core-image-minimal: | |||
39 | variables: | 42 | variables: |
40 | TEST_BUILD_DIR: 'build-core-image-minimal' | 43 | TEST_BUILD_DIR: 'build-core-image-minimal' |
41 | BITBAKE_TARGETS: 'core-image-minimal' | 44 | BITBAKE_TARGETS: 'core-image-minimal' |
42 | artifacts: | ||
43 | name: "core-image-minimal_$CI_COMMIT_REF_SLUG" | ||
44 | paths: | ||
45 | - $TEST_BUILD_DIR/tmp/deploy/images/*/core-image-minimal* | ||
46 | except: | 45 | except: |
47 | - pushes | 46 | - pushes |
48 | 47 | ||
@@ -56,8 +55,6 @@ Oe-selftest qemux86_64: | |||
56 | except: | 55 | except: |
57 | - pushes | 56 | - pushes |
58 | 57 | ||
59 | # Not run by default, triggered on nightlies | ||
60 | |||
61 | Oe-selftest minnowboard: | 58 | Oe-selftest minnowboard: |
62 | extends: .oe-selftest | 59 | extends: .oe-selftest |
63 | 60 | ||
@@ -67,9 +64,6 @@ Oe-selftest minnowboard: | |||
67 | OE_SELFTESTS: 'updater_minnowboard' | 64 | OE_SELFTESTS: 'updater_minnowboard' |
68 | except: | 65 | except: |
69 | - pushes | 66 | - pushes |
70 | only: | ||
71 | variables: | ||
72 | - $OE_MINNOWBOARD | ||
73 | 67 | ||
74 | Oe-selftest rpi: | 68 | Oe-selftest rpi: |
75 | extends: .oe-selftest | 69 | extends: .oe-selftest |
@@ -80,9 +74,8 @@ Oe-selftest rpi: | |||
80 | OE_SELFTESTS: 'updater_raspberrypi' | 74 | OE_SELFTESTS: 'updater_raspberrypi' |
81 | except: | 75 | except: |
82 | - pushes | 76 | - pushes |
83 | only: | 77 | |
84 | variables: | 78 | # Not run by default |
85 | - $OE_RPI | ||
86 | 79 | ||
87 | Ptest qemux86_64: | 80 | Ptest qemux86_64: |
88 | extends: .oe-selftest | 81 | extends: .oe-selftest |