From 06b34bccb7c5f857c56110ad208f84183aafcb9e Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 01:47:18 -0700 Subject: [PATCH 01/11] feat(pkg): adjust packages and configs Signed-off-by: zontreck --- server/airootfs/etc/hostname | 2 +- server/airootfs/etc/motd | 12 +----------- server/grub/loopback.cfg | 2 +- server/packages.x86_64 | 1 + .../syslinux/{archiso_tail.cfg => ariaos_tail.cfg} | 0 5 files changed, 4 insertions(+), 13 deletions(-) rename server/syslinux/{archiso_tail.cfg => ariaos_tail.cfg} (100%) diff --git a/server/airootfs/etc/hostname b/server/airootfs/etc/hostname index 2dbe21e..7d83a4f 100644 --- a/server/airootfs/etc/hostname +++ b/server/airootfs/etc/hostname @@ -1 +1 @@ -archiso +ariaos diff --git a/server/airootfs/etc/motd b/server/airootfs/etc/motd index 4d9eda1..6e58095 100644 --- a/server/airootfs/etc/motd +++ b/server/airootfs/etc/motd @@ -1,11 +1 @@ -To install Arch Linux follow the installation guide: -https://wiki.archlinux.org/title/Installation_guide - -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -For mobile broadband (WWAN) modems, connect with the mmcli utility. -Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. - -After connecting to the internet, the installation guide can be accessed -via the convenience script Installation_guide. - -                                           +Welcome to AriaOS Server Installation \ No newline at end of file diff --git a/server/grub/loopback.cfg b/server/grub/loopback.cfg index 3a5d244..b46fecf 100644 --- a/server/grub/loopback.cfg +++ b/server/grub/loopback.cfg @@ -21,7 +21,7 @@ else fi # Set default menu entry -default=archlinux +default=ariaos timeout=15 timeout_style=menu diff --git a/server/packages.x86_64 b/server/packages.x86_64 index 724adbf..e2195e6 100644 --- a/server/packages.x86_64 +++ b/server/packages.x86_64 @@ -4,6 +4,7 @@ arch-install-scripts archinstall b43-fwcutter base +base-devel bcachefs-tools bind bolt diff --git a/server/syslinux/archiso_tail.cfg b/server/syslinux/ariaos_tail.cfg similarity index 100% rename from server/syslinux/archiso_tail.cfg rename to server/syslinux/ariaos_tail.cfg From 64984f3d8a33a280b5363fb5fbdbf9d1f770ce4c Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:24:46 -0700 Subject: [PATCH 02/11] refactor(adjustment): adjust some build params Signed-off-by: zontreck --- Jenkinsfile | 2 +- server/profiledef.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 303d0dc..6a1d8b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { sh ''' #!/bin/bash - mkarchiso -v -w work -o out server + mkarchiso -v -w work -o out server/profiledef.sh ''' } } diff --git a/server/profiledef.sh b/server/profiledef.sh index 6d47901..bfacd66 100644 --- a/server/profiledef.sh +++ b/server/profiledef.sh @@ -2,7 +2,7 @@ # shellcheck disable=SC2034 iso_name="ariaos" -iso_label="AOSServer_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +iso_label="AriaOSServer_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="Aria " iso_application="AriaOS Server ISO" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" @@ -22,6 +22,5 @@ file_permissions=( ["/root/.automated_script.sh"]="0:0:755" ["/root/.gnupg"]="0:0:700" ["/usr/local/bin/choose-mirror"]="0:0:755" - ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" ) From 0ff361c10180b2f75888ec4ac23cfb4332f26bfc Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:24:49 -0700 Subject: [PATCH 03/11] =?UTF-8?q?bump:=20version=200.1.1=20=E2=86=92=200.2?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 ++++++++++ cz.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46443c4..70063df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 0.2.0 (2024-10-06) + +### Feat + +- **pkg**: adjust packages and configs + +### Refactor + +- **adjustment**: adjust some build params + ## 0.1.1 (2024-10-05) ### Refactor diff --git a/cz.json b/cz.json index 95e6392..1a24706 100644 --- a/cz.json +++ b/cz.json @@ -3,7 +3,7 @@ "name": "cz_conventional_commits", "tag_format": "$version", "version_scheme": "semver2", - "version": "0.1.1", + "version": "0.2.0", "update_changelog_on_bump": true, "major_version_zero": true } From b89ccd7458af764542cab9d02604a30ff4e8517e Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:35:27 -0700 Subject: [PATCH 04/11] ci(jenkins): fix build command Signed-off-by: zontreck --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a1d8b6..ef37a94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { sh ''' #!/bin/bash - mkarchiso -v -w work -o out server/profiledef.sh + mkarchiso -v -w "$(pwd)/work" -o out "$(pwd)/server" ''' } } From ee790e55ec3a5877d84fe60b59d5a1d19f924a10 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:39:39 -0700 Subject: [PATCH 05/11] ci(jenkins): adjust some more build instructions Signed-off-by: zontreck --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ef37a94..11d9306 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,11 @@ pipeline { sh ''' #!/bin/bash - mkarchiso -v -w "$(pwd)/work" -o out "$(pwd)/server" + mkdir -pv /tmp/archisotmp + cp -rv server /tmp/archisotmp/server + + + mkarchiso -v -w "/tmp/archisotmp/work" -o out "/tmp/archisotmp/server" ''' } } From 95ac8cebc92957b36bff838fa9c72386bc6a2ba4 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:41:15 -0700 Subject: [PATCH 06/11] feat(jenkins): change the output path Signed-off-by: zontreck --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11d9306..e68c132 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,9 @@ pipeline { cp -rv server /tmp/archisotmp/server - mkarchiso -v -w "/tmp/archisotmp/work" -o out "/tmp/archisotmp/server" + mkarchiso -v -w "/tmp/archisotmp/work" -o /tmp/archisotmp/out "/tmp/archisotmp/server" + + rm -rf /tmp/archisotmp ''' } } From 48e06389fb200100eb1f0a93d647bbabafdc96b2 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:44:12 -0700 Subject: [PATCH 07/11] ci(jenkins): finish jenkinsfile Signed-off-by: zontreck --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e68c132..e4ad43d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,10 +43,17 @@ pipeline { mkarchiso -v -w "/tmp/archisotmp/work" -o /tmp/archisotmp/out "/tmp/archisotmp/server" + cp -rv /tmp/archisotmp/out ./out rm -rf /tmp/archisotmp ''' } } + + post { + always { + archiveArtifacts artifacts: "out/*.iso" + } + } } } } \ No newline at end of file From 6d72b547ecb557bc21bf1585a59a6130d62ff8a8 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:44:19 -0700 Subject: [PATCH 08/11] =?UTF-8?q?bump:=20version=200.2.0=20=E2=86=92=200.3?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ cz.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70063df..9f813ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.3.0 (2024-10-06) + +### Feat + +- **jenkins**: change the output path + ## 0.2.0 (2024-10-06) ### Feat diff --git a/cz.json b/cz.json index 1a24706..563b918 100644 --- a/cz.json +++ b/cz.json @@ -3,7 +3,7 @@ "name": "cz_conventional_commits", "tag_format": "$version", "version_scheme": "semver2", - "version": "0.2.0", + "version": "0.3.0", "update_changelog_on_bump": true, "major_version_zero": true } From bbf5604f1c6a64be106af8dcf22c8705a85b78f5 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 02:59:51 -0700 Subject: [PATCH 09/11] ci(jenkins): continue to adjust to stabilize build Signed-off-by: zontreck --- server/profiledef.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/profiledef.sh b/server/profiledef.sh index bfacd66..436fca3 100644 --- a/server/profiledef.sh +++ b/server/profiledef.sh @@ -21,6 +21,4 @@ file_permissions=( ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" ["/root/.gnupg"]="0:0:700" - ["/usr/local/bin/choose-mirror"]="0:0:755" - ["/usr/local/bin/livecd-sound"]="0:0:755" ) From afe07bd542e5cc521944cee1f555e806f2fa9ff6 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 03:02:07 -0700 Subject: [PATCH 10/11] ci(jenkins): test another fix Signed-off-by: zontreck --- Jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4ad43d..77815e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,14 +37,8 @@ pipeline { sh ''' #!/bin/bash - mkdir -pv /tmp/archisotmp - cp -rv server /tmp/archisotmp/server + mkarchiso -v -w work -o out server - - mkarchiso -v -w "/tmp/archisotmp/work" -o /tmp/archisotmp/out "/tmp/archisotmp/server" - - cp -rv /tmp/archisotmp/out ./out - rm -rf /tmp/archisotmp ''' } } From 153fbc4104a649325affa631741c7233d0648608 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 6 Oct 2024 03:03:56 -0700 Subject: [PATCH 11/11] ci(jenkins): print current user before trying to make iso Signed-off-by: zontreck --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 77815e5..5aa0520 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,9 @@ pipeline { sh ''' #!/bin/bash + echo -ne "I am user " + whoami + mkarchiso -v -w work -o out server '''