canonical-hw-cert team mailing list archive

[Paolo Gentili <mp+434639@xxxxxxxxxxxxxxxxxx>]

Paolo Gentili has proposed merging ~pgentili/hwcert-jenkins-jobs:zapper-control-back into hwcert-jenkins-jobs:master.

Commit message:
Add: re-introduced zapper control snap job
Add: introduced zapper mainboard fw snap job 

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~pgentili/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/434639

Zapper Control job was removed by mistake in a previous commit.

Zapper Mainboard FW job is a new snap which provides and flashes firmware in Zapper Mainboard. It requires some submodules, hence the new flag for cloning with --recurse-submodules.
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~pgentili/hwcert-jenkins-jobs:zapper-control-back into hwcert-jenkins-jobs:master.

diff --git a/jobs/infrastructure/build-checkbox/snap-build-checkbox.yaml b/jobs/infrastructure/build-checkbox/snap-build-checkbox.yaml
index 80c6ec8..0256570 100644
--- a/jobs/infrastructure/build-checkbox/snap-build-checkbox.yaml
+++ b/jobs/infrastructure/build-checkbox/snap-build-checkbox.yaml
@@ -7,6 +7,7 @@
     channel: stable
     source-branch: master
     source-subdir: ''
+    recurse_submodules: ''
     lxd_template: ubuntu:x
     push_snap: true
     ssh-credential-id: 'ssh-ce-certification-qa'
@@ -50,6 +51,7 @@
     channel: stable
     source-branch: master
     source-subdir: ''
+    recurse_submodules: ''
     lxd_template: ubuntu:x
     push_snap: true
     ssh-credential-id: 'ssh-ce-certification-qa'
@@ -93,6 +95,7 @@
     channel: stable
     source-branch: master
     source-subdir: ''
+    recurse_submodules: ''
     lxd_template: ubuntu:x
     push_snap: true
     ssh-credential-id: 'ssh-ce-certification-qa'
diff --git a/jobs/infrastructure/build-zapper/snap-build-zapper-control.yaml b/jobs/infrastructure/build-zapper/snap-build-zapper-control.yaml
new file mode 100644
index 0000000..b63f5b4
--- /dev/null
+++ b/jobs/infrastructure/build-zapper/snap-build-zapper-control.yaml
@@ -0,0 +1,16 @@
+- project:
+    name: 'zapper-control'
+    description: |
+      This job will build and publish Zapper Control
+    source-url: git@xxxxxxxxxx:canonical/zapper.git
+    source-branch: main
+    source-subdir: 'zapper-control'
+    check-branches: ''
+    release-targets: 'latest/edge'
+    lxd_template: ubuntu:jammy
+    channel: '7.x/stable'
+    ssh-credential-id: 'ssh-github-zapper'
+    ssh-user: ''
+    jobs:
+      - 'snap-build-{name}-local-arm64'
+      - 'snap-build-{name}-local-trigger-arm'
diff --git a/jobs/infrastructure/build-zapper/snap-build-zapper-mainboard-fw.yaml b/jobs/infrastructure/build-zapper/snap-build-zapper-mainboard-fw.yaml
new file mode 100644
index 0000000..63c3be5
--- /dev/null
+++ b/jobs/infrastructure/build-zapper/snap-build-zapper-mainboard-fw.yaml
@@ -0,0 +1,17 @@
+- project:
+    name: 'zapper-mainboard-fw'
+    description: |
+      This job will build and publish Zapper Mainboard FW
+    source-url: git@xxxxxxxxxx:canonical/zapper.git
+    source-branch: main
+    source-subdir: 'mainboard-firmware'
+    check-branches: ''
+    recurse_submodules: true
+    release-targets: 'latest/edge'
+    lxd_template: ubuntu:jammy
+    channel: '7.x/stable'
+    ssh-credential-id: 'ssh-github-zapper'
+    ssh-user: ''
+    jobs:
+      - 'snap-build-{name}-local-arm64'
+      - 'snap-build-{name}-local-trigger-arm'
diff --git a/jobs/snap-build-test/snap-build-test.sh b/jobs/snap-build-test/snap-build-test.sh
index e34dbea..34570ad 100644
--- a/jobs/snap-build-test/snap-build-test.sh
+++ b/jobs/snap-build-test/snap-build-test.sh
@@ -20,7 +20,11 @@ EOF
 
 # Check out the project we want to build
 sudo rm -rf project
-git clone --depth 1 -b {source-branch} {source-url} project
+if [ -n "{recurse_submodules}" ]; then
+    git clone --depth 1 --recurse-submodules -b {source-branch} {source-url} project
+else
+    git clone --depth 1 -b {source-branch} {source-url} project
+fi
 
 # Build the lxc container
 # Note: if the container fails to start, you may need to perform the following