Merge pull request #348 from advancedtelematic/ci/dockerize

Ci/dockerize

1 files changed, 31 insertions, 10 deletions

diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
index 36ed059..1e87a7b 100755
--- a/scripts/ci/configure.sh
+++ b/scripts/ci/configure.sh
@@ -8,11 +8,11 @@ TEST_BUILD_DIR=${TEST_BUILD_DIR:-build}
 TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo}
 
 TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.}
-TEST_LOCAL_CONF_APPEND=${TEST_LOCAL_CONF_APPEND:-}
 TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master}
-TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="${TEST_AKTUALIZR_DIR}/.git" git rev-parse "${TEST_AKTUALIZR_BRANCH}")}
+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:-}
 
-# remove existing local.conf, keep
+# 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
 
@@ -23,11 +23,32 @@ echo ">> Running envsetup.sh"
 . "${TEST_REPO_DIR}/meta-updater/scripts/envsetup.sh" "${TEST_MACHINE}" "${TEST_BUILD_DIR}"
 )
 
-if [[ -n $TEST_LOCAL_CONF_APPEND ]]; then
-    echo ">> Appending to local.conf"
-    REMOTE_AKTUALIZR_BRANCH=$(sed 's#^[^/]*/##g' <<< "$TEST_AKTUALIZR_BRANCH")
-    cat "$TEST_LOCAL_CONF_APPEND" | \
-        sed "s/\$<rev-sha1>/$TEST_AKTUALIZR_REV/g" | \
-        sed "s/\$<rev-branch>/$REMOTE_AKTUALIZR_BRANCH/g" \
-        >> "${TEST_BUILD_DIR}/conf/local.conf"
+set +x
+
+echo ">> Set common bitbake config options"
+cat << EOF > "${TEST_BUILD_DIR}/conf/site.conf"
+SANITY_TESTED_DISTROS = ""
+SSTATE_MIRRORS ?= "file://.* https://bitbake-cache.atsgarage.com/PATH;downloadfilename=PATH"
+IMAGE_FEATURES += "ssh-server-openssh"
+
+EOF
+
+echo ">> Set aktualizr branch in bitbake's config"
+cat << EOF >> "${TEST_BUILD_DIR}/conf/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
+
+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"
+SSTATE_DIR = "$SSTATE_DIR"
+DL_DIR = "$DL_DIR"
+EOF
 fi