diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 43 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64.py | 2 | ||||
-rwxr-xr-x | scripts/ci/configure.sh | 27 | ||||
-rw-r--r-- | scripts/ci/gitlab/docker.yml | 8 | ||||
-rw-r--r-- | scripts/ci/gitlab/tests.yml | 3 |
5 files changed, 62 insertions, 21 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 5b975f0..a9a8174 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -80,15 +80,15 @@ IMAGE_CMD_ostree () { | |||
80 | if [ "$(ls -A $dir)" ]; then | 80 | if [ "$(ls -A $dir)" ]; then |
81 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" | 81 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" |
82 | fi | 82 | fi |
83 | |||
84 | if [ -n "${SYSTEMD_USED}" ]; then | ||
85 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
86 | else | ||
87 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
88 | fi | ||
89 | rm -rf ${dir} | 83 | rm -rf ${dir} |
90 | ln -sf var/rootdirs/${dir} ${dir} | ||
91 | fi | 84 | fi |
85 | |||
86 | if [ -n "${SYSTEMD_USED}" ]; then | ||
87 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
88 | else | ||
89 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
90 | fi | ||
91 | ln -sf var/rootdirs/${dir} ${dir} | ||
92 | done | 92 | done |
93 | 93 | ||
94 | if [ -d root ] && [ ! -L root ]; then | 94 | if [ -d root ] && [ ! -L root ]; then |
@@ -97,15 +97,40 @@ IMAGE_CMD_ostree () { | |||
97 | fi | 97 | fi |
98 | 98 | ||
99 | if [ -n "${SYSTEMD_USED}" ]; then | 99 | if [ -n "${SYSTEMD_USED}" ]; then |
100 | echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf} | 100 | echo "d /var/roothome 0700 root root -" >>${tmpfiles_conf} |
101 | else | 101 | else |
102 | echo "mkdir -p /var/roothome; chown 755 /var/roothome" >>${tmpfiles_conf} | 102 | echo "mkdir -p /var/roothome; chown 700 /var/roothome" >>${tmpfiles_conf} |
103 | fi | 103 | fi |
104 | 104 | ||
105 | rm -rf root | 105 | rm -rf root |
106 | ln -sf var/roothome root | 106 | ln -sf var/roothome root |
107 | fi | 107 | fi |
108 | 108 | ||
109 | if [ -d usr/local ] && [ ! -L usr/local ]; then | ||
110 | if [ "$(ls -A usr/local)" ]; then | ||
111 | bbfatal "Data in /usr/local directory is not preserved by OSTree." | ||
112 | fi | ||
113 | rm -rf usr/local | ||
114 | fi | ||
115 | |||
116 | if [ -n "${SYSTEMD_USED}" ]; then | ||
117 | echo "d /var/usrlocal 0755 root root -" >>${tmpfiles_conf} | ||
118 | else | ||
119 | echo "mkdir -p /var/usrlocal; chown 755 /var/usrlocal" >>${tmpfiles_conf} | ||
120 | fi | ||
121 | |||
122 | dirs="bin etc games include lib man sbin share src" | ||
123 | |||
124 | for dir in ${dirs}; do | ||
125 | if [ -n "${SYSTEMD_USED}" ]; then | ||
126 | echo "d /var/usrlocal/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
127 | else | ||
128 | echo "mkdir -p /var/usrlocal/${dir}; chown 755 /var/usrlocal/${dir}" >>${tmpfiles_conf} | ||
129 | fi | ||
130 | done | ||
131 | |||
132 | ln -sf ../var/usrlocal usr/local | ||
133 | |||
109 | if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then | 134 | if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then |
110 | # this is a hack for ostree not to override init= in kernel cmdline - | 135 | # this is a hack for ostree not to override init= in kernel cmdline - |
111 | # make it think that the initramfs is present (while it is in FIT image) | 136 | # make it think that the initramfs is present (while it is in FIT image) |
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): | |||
358 | self._test_ctx.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 358 | self._test_ctx.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
359 | 359 | ||
360 | def is_ecu_registered(self, ecu_id): | 360 | def is_ecu_registered(self, ecu_id): |
361 | max_number_of_tries = 40 | 361 | max_number_of_tries = 120 |
362 | try_counter = 0 | 362 | try_counter = 0 |
363 | 363 | ||
364 | # aktualizr-info is not always able to load ECU serials from DB | 364 | # 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} | |||
9 | TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-} | 9 | TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-} |
10 | 10 | ||
11 | TEST_AKTUALIZR_REMOTE=${TEST_AKTUALIZR_REMOTE:-} | 11 | TEST_AKTUALIZR_REMOTE=${TEST_AKTUALIZR_REMOTE:-} |
12 | TEST_AKTUALIZR_TAG=${TEST_AKTUALIZR_TAG:-} | ||
12 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then | 13 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then |
13 | TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.} | 14 | if [ -n "$TEST_AKTUALIZR_TAG" ]; then |
14 | TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master} | 15 | TEST_AKTUALIZR_BRANCH="" |
15 | TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")} | 16 | TEST_AKTUALIZR_REV="" |
17 | else | ||
18 | TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.} | ||
19 | TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master} | ||
20 | TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")} | ||
21 | fi | ||
16 | fi | 22 | fi |
17 | 23 | ||
18 | TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-} | 24 | TEST_AKTUALIZR_CREDENTIALS=${TEST_AKTUALIZR_CREDENTIALS:-} |
@@ -43,12 +49,23 @@ EOF | |||
43 | 49 | ||
44 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then | 50 | if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then |
45 | echo ">> Set aktualizr branch in bitbake's config" | 51 | echo ">> Set aktualizr branch in bitbake's config" |
46 | cat << EOF >> "$SITE_CONF" | 52 | if [ -n "$TEST_AKTUALIZR_TAG" ]; then |
53 | # tag case | ||
54 | cat << EOF >> "$SITE_CONF" | ||
55 | SRCREV_pn-aktualizr = "" | ||
56 | SRCREV_pn-aktualizr-native = "" | ||
57 | BRANCH_pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG" | ||
58 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" | ||
59 | EOF | ||
60 | else | ||
61 | # branch case | ||
62 | cat << EOF >> "$SITE_CONF" | ||
47 | SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV" | 63 | SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV" |
48 | SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" | 64 | SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" |
49 | BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" | 65 | BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" |
50 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" | 66 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" |
51 | EOF | 67 | EOF |
68 | fi | ||
52 | fi | 69 | fi |
53 | 70 | ||
54 | if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then | 71 | if [[ -n $TEST_AKTUALIZR_CREDENTIALS ]]; then |
@@ -70,5 +87,5 @@ DL_DIR = "$DL_DIR" | |||
70 | EOF | 87 | EOF |
71 | fi | 88 | fi |
72 | 89 | ||
73 | echo -e ">> Final configuration (site.conf):\n" | 90 | echo -e ">> Final configuration (site.conf):\\n" |
74 | cat "$SITE_CONF" | 91 | 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 @@ | |||
10 | stage: docker | 10 | stage: docker |
11 | services: | 11 | services: |
12 | - docker:18-dind | 12 | - docker:18-dind |
13 | before_script: | ||
14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
15 | script: | 13 | script: |
14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
15 | |||
16 | - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true | 16 | - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true |
17 | - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci | 17 | - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci |
18 | - docker push "$BITBAKE_IMAGE" | 18 | - docker push "$BITBAKE_IMAGE" |
@@ -30,8 +30,8 @@ | |||
30 | stage: docker | 30 | stage: docker |
31 | services: | 31 | services: |
32 | - docker:18-dind | 32 | - docker:18-dind |
33 | before_script: | ||
34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
35 | script: | 33 | script: |
34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
35 | |||
36 | - docker pull "$BITBAKE_IMAGE" | 36 | - docker pull "$BITBAKE_IMAGE" |
37 | - docker pull "$BITBAKE_CHECKOUT_IMAGE" | 37 | - 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 @@ | |||
24 | - bitbake | 24 | - bitbake |
25 | variables: | 25 | variables: |
26 | TEST_AKTUALIZR_CREDENTIALS: $CI_PROJECT_DIR/credentials.zip | 26 | TEST_AKTUALIZR_CREDENTIALS: $CI_PROJECT_DIR/credentials.zip |
27 | before_script: | 27 | script: |
28 | - aws s3 cp s3://ota-gitlab-ci/hereotaconnect_prod.zip credentials.zip | 28 | - aws s3 cp s3://ota-gitlab-ci/hereotaconnect_prod.zip credentials.zip |
29 | - sudo /usr/local/bin/setup_kvm.sh | 29 | - sudo /usr/local/bin/setup_kvm.sh |
30 | script: | ||
31 | - | | 30 | - | |
32 | # sg is needed after adding bitbake to the kvm group (see setup_kvm.sh) | 31 | # sg is needed after adding bitbake to the kvm group (see setup_kvm.sh) |
33 | sg kvm << EOS | 32 | sg kvm << EOS |