From e39fe8b4bdf3c2c50744f6dfcecafeffd6831505 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 24 Jul 2019 12:06:23 +0200 Subject: 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 --- scripts/ci/gitlab/docker.yml | 8 ++++---- scripts/ci/gitlab/tests.yml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'scripts') 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 @@ stage: docker services: - docker:18-dind - before_script: - - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" script: + - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" + - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci - docker push "$BITBAKE_IMAGE" @@ -30,8 +30,8 @@ stage: docker services: - docker:18-dind - before_script: - - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" script: + - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" + - docker pull "$BITBAKE_IMAGE" - 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 @@ - bitbake variables: TEST_AKTUALIZR_CREDENTIALS: $CI_PROJECT_DIR/credentials.zip - before_script: + script: - aws s3 cp s3://ota-gitlab-ci/hereotaconnect_prod.zip credentials.zip - sudo /usr/local/bin/setup_kvm.sh - script: - | # sg is needed after adding bitbake to the kvm group (see setup_kvm.sh) sg kvm << EOS -- cgit v1.2.3-54-g00ecf