2 files changed, 23 insertions, 18 deletions

diff --git a/scripts/ci/Jenkinsfile.bleeding b/scripts/ci/Jenkinsfile.bleeding
index aba7d39..f4d8883 100644
--- a/scripts/ci/Jenkinsfile.bleeding
+++ b/scripts/ci/Jenkinsfile.bleeding
@@ -56,27 +56,21 @@ pipeline {
            '''
       }
     }
-    stage('build-core-image-minimal') {
+    stage('build-core-image-minimal+oe-selftest') {
       agent {
         dockerfile {
           filename 'scripts/ci/Dockerfile.bitbake'
           args '-v /opt/jenkins/bitbake-common:/opt/jenkins/bitbake-common'
         }
       }
+      environment {
+        TEST_AKTUALIZR_CREDENTIALS = credentials('garage-credentials')
+      }
       steps {
         sh 'scripts/ci/configure.sh'
 
         sh 'scripts/ci/build.sh core-image-minimal'
-      }
-    }
-    stage('oe-selftest') {
-      agent {
-        dockerfile {
-          filename 'scripts/ci/Dockerfile.bitbake'
-          args '-v /opt/jenkins/bitbake-common:/opt/jenkins/bitbake-common'
-        }
-      }
-      steps {
+
         sh 'scripts/ci/oe-selftest.sh'
       }
     }
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
index 1e87a7b..960a0cc 100755
--- a/scripts/ci/configure.sh
+++ b/scripts/ci/configure.sh
@@ -6,27 +6,30 @@ set -x
 TEST_MACHINE=${TEST_MACHINE:-qemux86-64}
 TEST_BUILD_DIR=${TEST_BUILD_DIR:-build}
 TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo}
+TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-}
 
 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")}
-TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-}
+TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-}
 
 # move existing conf directory to backup, before generating a new one
-rm -rf "${TEST_BUILD_DIR}/conf.old" || true
-mv "${TEST_BUILD_DIR}/conf" "${TEST_BUILD_DIR}/conf.old" || true
+rm -rf "$TEST_BUILD_DIR/conf.old" || true
+mv "$TEST_BUILD_DIR/conf" "$TEST_BUILD_DIR/conf.old" || true
 
 (
 set +euo pipefail
 set +x
 echo ">> Running envsetup.sh"
-. "${TEST_REPO_DIR}/meta-updater/scripts/envsetup.sh" "${TEST_MACHINE}" "${TEST_BUILD_DIR}"
+. "$TEST_REPO_DIR/meta-updater/scripts/envsetup.sh" "$TEST_MACHINE" "$TEST_BUILD_DIR"
 )
 
 set +x
 
+SITE_CONF="$TEST_BUILD_DIR/conf/site.conf"
+
 echo ">> Set common bitbake config options"
-cat << EOF > "${TEST_BUILD_DIR}/conf/site.conf"
+cat << EOF > "$SITE_CONF"
 SANITY_TESTED_DISTROS = ""
 SSTATE_MIRRORS ?= "file://.* https://bitbake-cache.atsgarage.com/PATH;downloadfilename=PATH"
 IMAGE_FEATURES += "ssh-server-openssh"
@@ -34,7 +37,7 @@ IMAGE_FEATURES += "ssh-server-openssh"
 EOF
 
 echo ">> Set aktualizr branch in bitbake's config"
-cat << EOF >> "${TEST_BUILD_DIR}/conf/site.conf"
+cat << EOF >> "$SITE_CONF"
 SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV"
 SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}"
 BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH"
@@ -42,12 +45,20 @@ BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
 
 EOF
 
+if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then
+    echo ">> Set aktualizr credentials"
+    cat << EOF >> "$SITE_CONF"
+SOTA_PACKED_CREDENTIALS = "$TEST_AKTUALIZR_CREDENTIALS"
+EOF
+fi
+
 if [[ -n $TEST_BITBAKE_COMMON_DIR ]]; then
     echo ">> Set caching"
     SSTATE_DIR="$TEST_BITBAKE_COMMON_DIR/sstate-cache"
     DL_DIR="$TEST_BITBAKE_COMMON_DIR/downloads"
     mkdir -p "$SSTATE_DIR" "$DL_DIR"
-    cat << EOF >> "${TEST_BUILD_DIR}/conf/site.conf"
+
+    cat << EOF >> "$SITE_CONF"
 SSTATE_DIR = "$SSTATE_DIR"
 DL_DIR = "$DL_DIR"
 EOF