Enhance integration workflow

.github/scripts/integrate_workspace.sh

@@ -54,5 +54,11 @@ while IFS= read -r -d '' path; do
 done < <(find . -mindepth 1 -maxdepth 1 -print0)
 
 # Copy the upstream workspace on top, preserving flags, mtimes, ownership.
-# Ignore the "prebuilt" and "build" sub-folders.
-rsync -a --exclude='prebuilt' --exclude='build' "${workspace_root}/." .
+# Ignore the "prebuilt" and "build" sub-folders as well as everything that is
+# preserved in the integration repository.
+rsync_excludes=(--exclude='prebuilt' --exclude='build')
+for preserve_path in "${preserve_paths[@]}"; do
+  rsync_excludes+=(--exclude="/${preserve_path}")
+done
+
+rsync -a "${rsync_excludes[@]}" "${workspace_root}/." .

.github/scripts/qemu_smoke_test.sh

@@ -68,6 +68,9 @@ for i in $(seq 1 "${max_tries}"); do
   if grep -q "${msg}" "${log}" 2>/dev/null; then
     echo "Waiting for \"${msg}\" message in ${log} succeeded" >&2
     rm -f "${log}"
+    # remove files created during devcontainer run
+    rm -f "${workspace_root}/.devcontainer/timezone.env"
+    rm -f "${workspace_root}/.devcontainer/credentials.netrc"
     exit 0
   fi
   echo "Waiting for \"${msg}\" message in ${log} ... (${i}/${max_tries})" >&2

.github/workflows/upstream_integration.yml

@@ -152,8 +152,10 @@ jobs:
           git add -A
           if git diff --cached --quiet; then
             echo "No changes to commit; working copy already matches upstream."
+            echo "INTEGRATION_COMMIT_CREATED=false" >> "${GITHUB_ENV}"
           else
             git commit -m "Integrate upstream version ${RELEASE_VERSION}"
+            echo "INTEGRATION_COMMIT_CREATED=true" >> "${GITHUB_ENV}"
             git push origin "HEAD:${INTEGRATION_BRANCH}"
           fi
 
@@ -172,6 +174,7 @@ jobs:
             echo "pr_tag=${tag_prefix}${existing_pr}" >> "${GITHUB_OUTPUT}"
           else
             pr_url="$(gh pr create \
+              --draft \
               --head "${INTEGRATION_BRANCH}" \
               --base main \
               --title "Integrate upstream version ${RELEASE_VERSION}" \
@@ -205,10 +208,13 @@ jobs:
           git add "${devcontainer_json}" "${run_sh}"
           if git diff --cached --quiet; then
             echo "Tags already match; nothing to commit."
-          else
-            # Amend the previous commit to include the tag rewrite, so that the previous container tag is not left in the integration branch history.
+          elif [[ "${INTEGRATION_COMMIT_CREATED}" == "true" ]]; then
+            # Amend the integration commit only when this run created one.
             git commit --amend --no-edit
             git push --force-with-lease origin "HEAD:${INTEGRATION_BRANCH}"
+          else
+            git commit -m "Rewrite devcontainer image tag for PR"
+            git push origin "HEAD:${INTEGRATION_BRANCH}"
           fi
 
       - name: Update container tags and push to registry

README.md

@@ -24,7 +24,7 @@ Re-open it in the devcontainer.
 Open the [User's Manual](https://elektrobit.github.io/eb_corbos_toolkit/) and follow the instructions, starting with the section [Rebuild and Run Target Image](https://elektrobit.github.io/eb_corbos_toolkit/#_rebuild_and_run_target_image).
 
 > [!NOTE]
-> The instructions "Obtain EB corbos Toolkit", "Enter Development Container", and "Run Prebuilt Target Image" only work with the self-contained delivery archive.
+> The instructions "Obtain EB corbos Toolkit", "Enter Development Container", and "Run Prebuilt Target Image" work only with the self-contained delivery archive.
 
 ## Reporting Issues