Use plain bash instead of hacky sed for CI config files

3 files changed, 10 insertions, 16 deletions

diff --git a/scripts/ci/Jenkinsfile b/scripts/ci/Jenkinsfile
index fd0bc3b..84eebca 100644
--- a/scripts/ci/Jenkinsfile
+++ b/scripts/ci/Jenkinsfile
@@ -1,7 +1,6 @@
 pipeline {
   agent none
   environment {
-    TEST_LOCAL_CONF_APPEND = 'scripts/ci/local.conf.append'
     TEST_AKTUALIZR_DIR = 'aktualizr'
     TEST_AKTUALIZR_BRANCH = 'aktualizr/master'
     TEST_BITBAKE_COMMON_DIR = "${env.HOME}/bitbake-common"
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
index 36ed059..cf42825 100755
--- a/scripts/ci/configure.sh
+++ b/scripts/ci/configure.sh
@@ -8,11 +8,10 @@ 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}")}
 
-# 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 +22,12 @@ 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"
-fi
+echo ">> Set aktualizr branch in bitbake's config"
+
+cat << EOF > "${TEST_BUILD_DIR}/conf/site.conf"
+SANITY_TESTED_DISTROS = ""
+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
diff --git a/scripts/ci/local.conf.append b/scripts/ci/local.conf.append
deleted file mode 100644
index 350e466..0000000
--- a/scripts/ci/local.conf.append
+++ /dev/null
@@ -1,5 +0,0 @@
-SANITY_TESTED_DISTROS = ""
-SRCREV_pn-aktualizr = "$<rev-sha1>"
-SRCREV_pn-aktualizr-native = "${SRCREV_pn-aktualizr}"
-BRANCH_pn-aktualizr = "$<rev-branch>"
-BRANCH_pn-aktualizr-native = "${BRANCH_pn-aktualizr}"