From bd9c653a69518aa9edf3a7fbdc0ade5a142d34c1 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Mon, 2 Oct 2023 01:52:27 +0200 Subject: [PATCH] Added Temp variant for buildng apk PKGS Added x86_64 to Alpine Arch list Added jenkinsAPKbuilder to alpine with the following: * Packages required for Jenkins-agent * Packages required for Alpine package development * Added BuildNode public ssh key --- buildCT.sh | 4 ++-- distros/Alpine318.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/buildCT.sh b/buildCT.sh index 814561d..63b4261 100644 --- a/buildCT.sh +++ b/buildCT.sh @@ -38,8 +38,8 @@ cd "$( cd "$( dirname "$0" )" &> /dev/null && pwd )" if $interactive;then echo Entering interactive mode... #Set lists for menu - variantList=("minimal" "default" ) - archListAlpine=("aarch64" "armhf" "armv7") + variantList=("minimal" "default" "jenkinsAPKbuilder") + archListAlpine=("aarch64" "armhf" "armv7" "x86_64") archListDebian=("arm64" "armhf" "armel") archListRasPiOS=("armhf") diff --git a/distros/Alpine318.yaml b/distros/Alpine318.yaml index a5aa0e6..49b75af 100644 --- a/distros/Alpine318.yaml +++ b/distros/Alpine318.yaml @@ -172,6 +172,18 @@ packages: variants: - default + #PKGS for jenkinsAPKbuilder + - packages: + - nano + - openssh-server + - openjdk17-jre-headless + - git + - doas + - doas-sudo-shim + - alpine-sdk + action: install + variants: + - jenkinsAPKbuilder repositories: - name: /etc/apk/repositories @@ -208,5 +220,23 @@ actions: echo "Europe/Amsterdam" > /etc/timezone ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime +- trigger: post-packages + action: |- + #!/bin/sh + adduser --disabled-password --gecos "" jenkins + passwd jenkins -d $(openssl rand -base64 64) + addgroup jenkins abuild + chgrp abuild /var/cache/distfiles + chmod g+w /var/cache/distfiles + echo "permit nopass root" > /etc/doas.d/jenkinsAPKbuilder.conf + echo "permit nopass jenkins" >> /etc/doas.d/jenkinsAPKbuilder.conf + chmod 0600 /etc/doas.d/jenkinsAPKbuilder.conf + doas -u jenkins abuild-keygen -a -i -n + rc-update add sshd + doas -u jenkins mkdir -p /home/jenkins/.ssh + doas -u jenkins echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNO+RkCV9gMs8OCUt0l1Jl0ODyBJt/NqGEQLmgCXObPgV/t25zxRF8ovQ8TATE3KVoICWFJN4PyThmaTqzXMEBLPAdkGmWW7rMnM7//77Ae+RQHh6KNvH8xaey6WzGvJ4eM1oJvCannrvMlcI+lBzki0tF6cFsce8o9/KY9ZbLtt5psgXy4R0r1OB595scVa+MWcota2INIY/8Qq3LtO3KZgYXpaQe+/7T1h+uvNK0InSYZDuRw5Bqk1V9yK0Ws64Ri9GFRf1skTzQgN3HBwLbD1U6oopmzLD9U6X8oiPER/zWtYwSnQZ5GCVFH7pUIm345jqGY41r7pgUXV44pdKI78wgMhO/m3tDqNRqbxZxVySArpVLH+NEtLlTIvgJpdXuAW4K6HiFJlitxo+1BJ8ciKnn5XxPErimwyb1kiswrTWvs8srKFZsA/TZetRNRmMGPkkDUUm12H8Ri0QBSDBQaSh5xPsb7Io20rk/ox24hjO89cTbqOmmbfU2NGtQMMs= BuilderNodes@Jenkins" > /home/jenkins/.ssh/authorized_keys + variants: + - jenkinsAPKbuilder + mappings: architecture_map: alpinelinux