Move `before_script` gitlab steps to `script` (#563)

Move `before_script` gitlab steps to `script`

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 @@
   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