summaryrefslogtreecommitdiffstats
path: root/scripts/ci
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-07-24 12:06:23 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2019-07-24 12:06:23 +0200
commite39fe8b4bdf3c2c50744f6dfcecafeffd6831505 (patch)
tree4abbfa4bf30e3f3171befd0225275f6e3147fce0 /scripts/ci
parent7530d93ebb97b519a12b88d121320ac0bb711c46 (diff)
downloadmeta-updater-e39fe8b4bdf3c2c50744f6dfcecafeffd6831505.tar.gz
Move `before_script` gitlab steps to `script`
So that `before_script` can be used for additional steps when sub-classing Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'scripts/ci')
-rw-r--r--scripts/ci/gitlab/docker.yml8
-rw-r--r--scripts/ci/gitlab/tests.yml3
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/ci/gitlab/docker.yml b/scripts/ci/gitlab/docker.yml
index 5b81d77..ba488c6 100644
--- a/scripts/ci/gitlab/docker.yml
+++ b/scripts/ci/gitlab/docker.yml
@@ -10,9 +10,9 @@
10 stage: docker 10 stage: docker
11 services: 11 services:
12 - docker:18-dind 12 - docker:18-dind
13 before_script:
14 - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
15 script: 13 script:
14 - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
15
16 - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true 16 - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true
17 - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci 17 - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci
18 - docker push "$BITBAKE_IMAGE" 18 - docker push "$BITBAKE_IMAGE"
@@ -30,8 +30,8 @@
30 stage: docker 30 stage: docker
31 services: 31 services:
32 - docker:18-dind 32 - docker:18-dind
33 before_script:
34 - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
35 script: 33 script:
34 - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
35
36 - docker pull "$BITBAKE_IMAGE" 36 - docker pull "$BITBAKE_IMAGE"
37 - docker pull "$BITBAKE_CHECKOUT_IMAGE" 37 - docker pull "$BITBAKE_CHECKOUT_IMAGE"
diff --git a/scripts/ci/gitlab/tests.yml b/scripts/ci/gitlab/tests.yml
index 4bd5844..4175412 100644
--- a/scripts/ci/gitlab/tests.yml
+++ b/scripts/ci/gitlab/tests.yml
@@ -24,10 +24,9 @@
24 - bitbake 24 - bitbake
25 variables: 25 variables:
26 TEST_AKTUALIZR_CREDENTIALS: $CI_PROJECT_DIR/credentials.zip 26 TEST_AKTUALIZR_CREDENTIALS: $CI_PROJECT_DIR/credentials.zip
27 before_script: 27 script:
28 - aws s3 cp s3://ota-gitlab-ci/hereotaconnect_prod.zip credentials.zip 28 - aws s3 cp s3://ota-gitlab-ci/hereotaconnect_prod.zip credentials.zip
29 - sudo /usr/local/bin/setup_kvm.sh 29 - sudo /usr/local/bin/setup_kvm.sh
30 script:
31 - | 30 - |
32 # sg is needed after adding bitbake to the kvm group (see setup_kvm.sh) 31 # sg is needed after adding bitbake to the kvm group (see setup_kvm.sh)
33 sg kvm << EOS 32 sg kvm << EOS