Sébastien Heurtematte · e82e81db · ff4b523d · cc9c7b57 · c7a0c14b · aabd7c54
--- a/.oniro-ci/build-generic.yaml

+ 15

− 8
+++ b/.oniro-ci/build-generic.yaml

+ 15

− 8
 @@ -6,7 +6,6 @@
  interruptible: true
  image:
    name: registry.ostc-eu.org/ostc/oniro/bitbake-builder:latest
-  tags: [large-disk, $CI_ONIRO_RUNNER_TAG, $CI_ONIRO_INSTANCE_SIZE]
  variables:
    CI_ONIRO_RUNNER_TAG : ""
    CI_ONIRO_MANIFEST_URL: https://gitlab.eclipse.org/eclipse/oniro-core/oniro
 @@ -28,7 +27,7 @@
    # Create scratch space, being careful not to pollute the working directory.
    # This is done so that we are not attached to the contents of
    # $CI_PROJECT_DIR which contains something that GitLab CI prepared for us.
-    - SCRATCH_DIR="$(mktemp -p /tmp -d workspace.XXXXXXXXXX)"
+    - SCRATCH_DIR="$(mktemp -p $TMPDIR -d workspace.XXXXXXXXXX)"
    - echo "$SCRATCH_DIR" > "$CI_PROJECT_DIR"/.scratch-dir-name
    - cd "$SCRATCH_DIR"

 @@ -104,10 +103,17 @@
    CI_ONIRO_BB_LOCAL_CONF_CVE_CHECK_DB_DIR: "$${TMPDIR}/CVE_CHECK/"
    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check
    CI_ONIRO_BB_LOCAL_CONF_plus_equals_USER_CLASSES: "buildstats buildstats-summary"
+    CI_ONIRO_BB_LOCAL_CONF_FETCHCMD_wget: "/usr/bin/env wget -L -t 6 -T 5 --passive-ftp"
    CI_ONIRO_DEVTOOL_RECIPE_NAME: ""
    CI_ONIRO_DEVTOOL_LAYER_PATH: ""

  before_script:
+    # Tell git this repository is safe even if cloned with a different uid
+    - |
+      git config --global --add safe.directory $CI_PROJECT_DIR
+      git config --global user.email "$GITLAB_USER_EMAIL"
+      git config --global user.name "$GITLAB_USER_NAME"
+
    # Bitbake requires a non-root user to operate.
    # The container should have a non-root user by default.
    - test "$(id -u)" -ne 0 || (
 @@ -131,9 +137,11 @@
    - test -n "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE" || (
        echo "precondition failed - CI_ONIRO_RUNNER_PERSISTENT_STORAGE is not set"
        && exit 1 )
-    - test -w "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake" || (
-        echo "precondition failed - expected $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake to be writable"
-        && exit 1 )
+    - |
+      mkdir -p $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/pub/bitbake
+      mkdir -p $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/private/bitbake
+      chmod 775 $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/{private,pub}
+      chmod 775 $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/{private,pub}/bitbake
    # Log available disk space on the persistent shared disk.
    - df -h "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake"
    - !reference [.workspace, before_script]
 @@ -165,7 +173,7 @@
        env \
          | grep -v "_plus_equals_" \
          | grep -E '^CI_ONIRO_BB_LOCAL_CONF_[a-zA-Z_0-9]+=' \
-          | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_//g' -e 's/_colon_/:/g' -e 's/"/\\"/g' -e 's/=/ = "/g' -e 's/$/"/g' \
+          | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_//g' -e 's/_colon_/:/g' -e 's/"/\\"/g' -e 's/=/ = "/g' -e 's/$/"/g' -e 's/WARN_QA/WARN_QA:/g' -e 's/ERROR_QA/ERROR_QA:/g' \
          | sort \
          | tee -a conf/local.conf )
    # Variables in the form of 'CI_ONIRO_BB_LOCAL_CONF_plus_equals_attr' are
 @@ -174,7 +182,7 @@
      ( set +o pipefail;
        env \
          | grep -E '^CI_ONIRO_BB_LOCAL_CONF_plus_equals_[A-Z_0-9]+=' \
-          | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \
+          | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' -e 's/WARN_QA/WARN_QA:/g' -e 's/ERROR_QA/ERROR_QA:/g' \
          | sort \
          | tee -a conf/local.conf )
    # Variables in the form of '^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_attr' are
 @@ -408,7 +416,6 @@
 .oe-selftest:
  image:
    name: registry.ostc-eu.org/ostc/oniro/bitbake-builder:latest
-  tags: [qemu-friendly, large-disk, $CI_ONIRO_RUNNER_TAG, $CI_ONIRO_INSTANCE_SIZE]
  stage: test
  dependencies: []
  extends: .bitbake-workspace