Merge ~fourdollars/pc-enablement/+git/oem-scripts:master into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Shih-Yuan Lee]

Fix the problem when opening the cloudberry bugs for oem-somerville-charmander-meta, oem-somerville-kakuna-meta, oem-somerville-kingdra-adl-meta, oem-somerville-oranguru-meta, oem-somerville-pidgeot-meta and oem-somerville-spearow-meta.

Before this commit,
$ oem-meta-packages --dry-run staging-copy --meta oem-somerville-charmander-meta
<INFO> Using oem-scripts login
<INFO> Checking oem-somerville-charmander-meta...
<INFO> OemFromGit (20.04ubuntu13, default, linux-generic-hwe-20.04, , Latitude 5320/5520, Precision 3560)
<INFO> OemFromPPA (20.04ubuntu13, default, linux-generic-hwe-20.04, ppa:oem-archive/somerville-fossa-charmander, Latitude 5320/5520, Precision 3560)
<INFO> OemFromDevelArchive (, , , , )
<INFO> OemFromStagingArchive (, , , , )
<INFO> OemFromPublicArchive (20.04ubuntu10, oem, linux-oem-20.04c, oem:somerville-charmander, )
...

After this commit,
$ ./oem-meta-packages staging-copy --meta oem-somerville-charmander-meta
<INFO> Using oem-scripts login
<INFO> Checking oem-somerville-charmander-meta...
<INFO> OemFromGit (20.04ubuntu13, default, linux-generic-hwe-20.04, , Latitude 5320/5520, Precision 3560)
<INFO> OemFromPPA (20.04ubuntu13, default, linux-generic-hwe-20.04, ppa:oem-archive/somerville-fossa-charmander, Latitude 5320/5520, Precision 3560)
<INFO> OemFromDevelArchive (20.04ubuntu13, default, linux-generic-hwe-20.04, cesg:somerville-fossa-charmander-focal-devel, Latitude 5320/5520, Precision 3560)
<INFO> OemFromStagingArchive (20.04ubuntu10, oem, linux-oem-20.04c, cesg:somerville-fossa-charmander-focal-staging, )
<INFO> OemFromPublicArchive (20.04ubuntu10, oem, linux-oem-20.04c, oem:somerville-charmander, )

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.51-85f3334-in-linux-container-jammy

[jeremyszu (os369510)]

I don't quite familiar with this piece of code but I think we should gate it by oem-meta-package of autopkgtest because different OEM/LTS have different rule.

I thought
```
oem-meta-packages SKIP exit status 77 and marked as skippable
```

May I know why it be skipped? If we have some test cases from
1. stella-cmit-focal
2. sutton-bachman-focal
3. sutton-newwell-focal
4. sutton-simon-focal
5. somerville-focal

6. stella-jammy
7. sutton-jammy
8. somerville-jammy

Then it will be easy to be reviewed.

[Shih-Yuan Lee (fourdollars)]

The original tests only aim on focal.
Current testing environment is on jammy so the test is skipped.
BTW, *-jammy archives are not supported yet.

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa FAIL non-zero exit status 1
jq-lp PASS
launchpad-api FAIL non-zero exit status 1
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages PASS
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.51-a3f729a-in-linux-container-jammy

[jeremyszu (os369510)]

could we test stella & sutton cases?

[Shih-Yuan Lee (fourdollars)]

I just added stella and sutton cases. Please help to review it again.

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages PASS
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.51-74dff19-in-linux-container-jammy

[jeremyszu (os369510)]

LGTM, thanks!

review: Approve

diff --git a/debian/tests/oem-meta-packages b/debian/tests/oem-meta-packages
index 5f9b531..d1e219f 100644
--- a/debian/tests/oem-meta-packages
+++ b/debian/tests/oem-meta-packages
@@ -35,31 +35,40 @@ export LAUNCHPAD_API="https://api.launchpad.net/"
 
 oem-meta-packages --quiet list
 
-if [ "$(lsb_release -cs)" != focal ]; then
-    exit 77
-fi
+case "$(lsb_release -cs)" in
+    (focal)
+        oem-meta-packages --quiet collect --json platforms.json --output meta-info.json # --output platforms-meta-info.json (by default)
+        if [ "x$(jq -r '."oem-somerville-beric-icl-meta".new_desc' < meta-info.json)" != "xDell Inspiron 3501, Vostro 3401/3501" ]; then
+            jq -S -M < meta-info.json
+            exit 1
+        fi
 
-oem-meta-packages --quiet collect --json platforms.json --output meta-info.json # --output platforms-meta-info.json (by default)
-if [ "x$(jq -r '."oem-somerville-beric-icl-meta".new_desc' < meta-info.json)" != "xDell Inspiron 3501, Vostro 3401/3501" ]; then
-    jq -S -M < meta-info.json
-    exit 1
-fi
+        oem-meta-packages --quiet collect --meta oem-somerville-beric-icl-meta  # --output oem-somerville-beric-icl-meta.json (by default)
+        if [ "x$(jq -r '."oem-somerville-beric-icl-meta".oem.git.market_name' < oem-somerville-beric-icl-meta.json)" != "xInspiron 3501, Vostro 3401/3501" ]; then
+            jq -S -M < oem-somerville-beric-icl-meta.json
+            exit 1
+        fi
 
-oem-meta-packages --quiet collect --meta oem-somerville-beric-icl-meta  # --output oem-somerville-beric-icl-meta.json (by default)
-if [ "x$(jq -r '."oem-somerville-beric-icl-meta".oem.git.market_name' < oem-somerville-beric-icl-meta.json)" != "xInspiron 3501, Vostro 3401/3501" ]; then
-    jq -S -M < oem-somerville-beric-icl-meta.json
-    exit 1
-fi
+        oem-meta-packages --dry-run update --json meta-info.json
 
-oem-meta-packages --dry-run update --json meta-info.json
+        sed -i 's/"staging_version":.*/"staging_version": "20.04ubuntu2",/' meta-info.json # lower the staging version to simulate
 
-sed -i 's/"staging_version":.*/"staging_version": "20.04ubuntu2",/' meta-info.json # lower the staging version to simulate
+        oem-meta-packages --dry-run staging-copy --json meta-info.json
 
-oem-meta-packages --dry-run staging-copy --json meta-info.json
+        oem-meta-packages --dry-run staging-copy --ignore-staging-lock --json meta-info.json
 
-oem-meta-packages --dry-run staging-copy --ignore-staging-lock --json meta-info.json
-
-for project in somerville stella sutton; do
-    meta="$(apt-cache search oem-"$project" | awk '{print $1}' | shuf | head -n 1)"
-    oem-meta-packages --dry-run update --meta "$meta" --factory
-done
+        for project in somerville stella sutton; do
+            meta="$(apt-cache search oem-"$project" | awk '{print $1}' | shuf | head -n 1)"
+            oem-meta-packages --dry-run update --meta "$meta" --factory
+        done
+        ;;
+    (jammy)
+        oem-meta-packages --dry-run staging-copy --meta oem-somerville-kingdra-adl-meta 2>&1 | grep -e cesg:somerville-fossa-kingdra-adl-focal-staging -e somerville-fossa-kingdra-adl-focal-devel
+        oem-meta-packages --dry-run staging-copy --meta oem-somerville-charmander-meta 2>&1 | grep -e cesg:somerville-fossa-charmander-focal-staging -e cesg:somerville-fossa-charmander-focal-devel
+        oem-meta-packages --dry-run staging-copy --meta oem-stella.cmit-aerodactyl-meta 2>&1 | grep -e cesg:stella-cmit-ouagadougou-focal-staging -e stella-cmit-ouagadougou-focal-devel
+        oem-meta-packages --dry-run staging-copy --meta oem-sutton.newell-aaden-meta 2>&1 | grep -e cesg:sutton-newell-focal-staging -e cesg:sutton-newell-focal-devel
+        ;;
+    (*)
+        exit 77
+        ;;
+esac
diff --git a/oem-meta-packages b/oem-meta-packages
index 446c663..e163c6b 100755
--- a/oem-meta-packages
+++ b/oem-meta-packages
@@ -1309,16 +1309,26 @@ class OemFromPrivateArchive(OemMetaPkgInfo):
             codename = self.platform
         else:
             codename = self.group
+
         for line in index.split("\n"):
-            if (
-                self.project in line
-                and codename in line
-                and f"focal-{self._branch}" in line
-            ):
+            if self.project in line and f"{codename}-focal-{self._branch}" in line:
                 result = self.staging_pattern.match(line)
                 if result:
                     archive = result.group(1)
                     break
+
+        if not archive:
+            for line in index.split("\n"):
+                if (
+                    self.project in line
+                    and codename in line
+                    and f"focal-{self._branch}" in line
+                ):
+                    result = self.staging_pattern.match(line)
+                    if result:
+                        archive = result.group(1)
+                        break
+
         source_line = config["archive"].replace(
             "https://", f"https://{config['username']}:{config['password']}@"
         )