This repository contains the code used to build the Ubuntu-based Delphix Appliance, leveraging open-source tools such as Debian's live-build, Docker, Ansible, OpenZFS, and others.
Apache License 2.0
19
stars
41
forks
source link
DLPX-85710 appliance-build: Ansible task checks out outdated branch of ZFS repo on dev variants #722
The default branch of the ZFS repo is now `develop`. As such, development primarily occurs on this branch. These repos are checked out on dev variants for convenience so that tools like git-appliance-update (and possibly other tools) do not take too long to push the entire repo onto the engine. The ansible task currently checks out the `master` branch which is now defunct.
Solution
Update the task to checkout `develop` instead.
Testing Done
PR checks should suffice, which includes appliance-build.
From the build:
```
13:37:39 TASK [appliance-build.zfsonlinux-development : git] ****************************
13:37:39 task path: /var/tmp/jenkins/workspace/appliance-build-stage1/pre-push/appliance-build/live-build/misc/ansible-roles/appliance-build.zfsonlinux-development/tasks/main.yml:63
13:37:39 redirecting (type: connection) ansible.builtin.chroot to community.general.chroot
13:37:55 changed: [binary] => {"after": "bc25316dd58a712fc3b3968a7a164925bded09c2", "before": null, "changed": true, "submodules_changed": true}
```
which is the current tip of `develop`:
```
[Wed Apr 19, 04:17:27] ~/git/zfs (develop)
$ gl -1
commit bc25316dd58a712fc3b3968a7a164925bded09c2 (HEAD -> develop, delphix/develop)
```
The default branch of the ZFS repo is now `develop`. As such, development primarily occurs on this branch. These repos are checked out on dev variants for convenience so that tools like git-appliance-update (and possibly other tools) do not take too long to push the entire repo onto the engine. The ansible task currently checks out the `master` branch which is now defunct.Problem
Update the task to checkout `develop` instead.Solution
PR checks should suffice, which includes appliance-build. From the build: ``` 13:37:39 TASK [appliance-build.zfsonlinux-development : git] **************************** 13:37:39 task path: /var/tmp/jenkins/workspace/appliance-build-stage1/pre-push/appliance-build/live-build/misc/ansible-roles/appliance-build.zfsonlinux-development/tasks/main.yml:63 13:37:39 redirecting (type: connection) ansible.builtin.chroot to community.general.chroot 13:37:55 changed: [binary] => {"after": "bc25316dd58a712fc3b3968a7a164925bded09c2", "before": null, "changed": true, "submodules_changed": true} ``` which is the current tip of `develop`: ``` [Wed Apr 19, 04:17:27] ~/git/zfs (develop) $ gl -1 commit bc25316dd58a712fc3b3968a7a164925bded09c2 (HEAD -> develop, delphix/develop) ```Testing Done