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

Move `before_script` gitlab steps to `script`

4 files changed, 28 insertions, 12 deletions

diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index 2b4726c..c65d6e9 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -358,7 +358,7 @@ class IpSecondaryTests(OESelftestTestCase):
             self._test_ctx.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
 
         def is_ecu_registered(self, ecu_id):
-            max_number_of_tries = 40
+            max_number_of_tries = 120
             try_counter = 0
 
             # aktualizr-info is not always able to load ECU serials from DB
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
index 67563ed..ae78f06 100755
--- a/scripts/ci/configure.sh
+++ b/scripts/ci/configure.sh
@@ -9,10 +9,16 @@ TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo}
 TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-}
 
 TEST_AKTUALIZR_REMOTE=${TEST_AKTUALIZR_REMOTE:-}
+TEST_AKTUALIZR_TAG=${TEST_AKTUALIZR_TAG:-}
 if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then
-    TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.}
-    TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master}
-    TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")}
+    if [ -n "$TEST_AKTUALIZR_TAG" ]; then
+        TEST_AKTUALIZR_BRANCH=""
+        TEST_AKTUALIZR_REV=""
+    else
+        TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.}
+        TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master}
+        TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")}
+    fi
 fi
 
 TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-}
@@ -43,12 +49,23 @@ EOF
 
 if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then
     echo ">> Set aktualizr branch in bitbake's config"
-    cat << EOF >> "$SITE_CONF"
+    if [ -n "$TEST_AKTUALIZR_TAG" ]; then
+        # tag case
+        cat << EOF >> "$SITE_CONF"
+SRCREV_pn-aktualizr = ""
+SRCREV_pn-aktualizr-native = ""
+BRANCH_pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG"
+BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
+EOF
+    else
+        # branch case
+        cat << EOF >> "$SITE_CONF"
 SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV"
 SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}"
 BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH"
 BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
 EOF
+    fi
 fi
 
 if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then
@@ -70,5 +87,5 @@ DL_DIR = "$DL_DIR"
 EOF
 fi
 
-echo -e ">> Final configuration (site.conf):\n"
+echo -e ">> Final configuration (site.conf):\\n"
 cat "$SITE_CONF"
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