Skip to content

Commit

Permalink
Revert "Zeus gitlab pipeline definitions"
Browse files Browse the repository at this point in the history
This reverts commit 95238dd.
  • Loading branch information
lbonn committed Nov 22, 2019
1 parent bfe4407 commit b747f1b
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@ stages:
- test

variables:
BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-checkout
BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-bitbake
BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-checkout

include:
- project: 'olp/edge/ota/connect/client/meta-updater'
ref: 'master'
file: 'scripts/ci/gitlab/docker.yml'
- project: 'olp/edge/ota/connect/client/meta-updater'
ref: 'master'
file: 'scripts/ci/gitlab/checkout.yml'
- project: 'olp/edge/ota/connect/client/meta-updater'
ref: 'master'
file: 'scripts/ci/gitlab/tests.yml'
- local: "scripts/ci/gitlab/docker.yml"
- local: "scripts/ci/gitlab/checkout.yml"
- local: "scripts/ci/gitlab/tests.yml"

Docker setup:
extends: .bb_docker_remote
extends: .bb_docker_local

stage: docker
variables:
BITBKAE_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
BITBAKE_CHECKOUT_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-checkout
except:
- pushes

Expand All @@ -30,7 +27,7 @@ Checkout:

stage: checkout
variables:
MANIFEST: zeus
MANIFEST: master
CURRENT_PROJECT: meta-updater
except:
- pushes
Expand Down Expand Up @@ -74,6 +71,8 @@ Oe-selftest qemux86_64:
except:
- pushes

# Not run by default, triggered on nightlies

Oe-selftest minnowboard:
extends: .oe-selftest

Expand All @@ -83,6 +82,9 @@ Oe-selftest minnowboard:
OE_SELFTESTS: 'updater_minnowboard'
except:
- pushes
only:
variables:
- $OE_MINNOWBOARD

Oe-selftest rpi:
extends: .oe-selftest
Expand Down

0 comments on commit b747f1b

Please sign in to comment.