diff options
-rwxr-xr-x | scripts/ci/configure.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh index 960a0cc..2101c64 100755 --- a/scripts/ci/configure.sh +++ b/scripts/ci/configure.sh | |||
@@ -8,9 +8,13 @@ TEST_BUILD_DIR=${TEST_BUILD_DIR:-build} | |||
8 | TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo} | 8 | TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo} |
9 | TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-} | 9 | TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-} |
10 | 10 | ||
11 | TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.} | 11 | TEST_AKTUALIZR_REMOTE=${TEST_AKTUALIZR_REMOTE:-} |
12 | TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master} | 12 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then |
13 | TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")} | 13 | TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.} |
14 | TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master} | ||
15 | TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")} | ||
16 | fi | ||
17 | |||
14 | TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-} | 18 | TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-} |
15 | 19 | ||
16 | # move existing conf directory to backup, before generating a new one | 20 | # move existing conf directory to backup, before generating a new one |
@@ -36,14 +40,15 @@ IMAGE_FEATURES += "ssh-server-openssh" | |||
36 | 40 | ||
37 | EOF | 41 | EOF |
38 | 42 | ||
39 | echo ">> Set aktualizr branch in bitbake's config" | 43 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then |
40 | cat << EOF >> "$SITE_CONF" | 44 | echo ">> Set aktualizr branch in bitbake's config" |
45 | cat << EOF >> "$SITE_CONF" | ||
41 | SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV" | 46 | SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV" |
42 | SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" | 47 | SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" |
43 | BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" | 48 | BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" |
44 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" | 49 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" |
45 | |||
46 | EOF | 50 | EOF |
51 | fi | ||
47 | 52 | ||
48 | if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then | 53 | if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then |
49 | echo ">> Set aktualizr credentials" | 54 | echo ">> Set aktualizr credentials" |