chore: add jenkins pipeline

Jenkinsfile

@@ -29,38 +29,27 @@ pipeline {
             }
             steps {
                 script {
-                    currentEmissaryRelease = readFile('emissary_release.txt').trim()
+                    steps {
+                        currentEmissaryRelease = readFile('emissary_release.txt')
 
-                    if (currentEmissaryRelease == params.emissaryRelease) {
+                        if (currentEmissaryRelease == params.emissaryRelease) {
-                        currentBuild.result = 'SUCCESS'
+                            currentBuild.result = 'SUCCESS'
-                        return
+                            return
-                    }
+                        }
 
-                    withCredentials([
-                        usernamePassword([
-                        credentialsId: 'forge-jenkins',
-                        usernameVariable: 'GIT_USERNAME',
-                        passwordVariable: 'GIT_PASSWORD'
-                        ])
-                    ]) {
                         sh """
-                        git config user.email "jenkins@cadoles.com"
-                        git config user.name "Jenkins"
-                        git config credential.https://forge.cadoles.com.username "\$GIT_USERNAME"
-                        git config credential.https://forge.cadoles.com.helper '!f() { test "\$1" = get && echo "password=\$GIT_PASSWORD"; }; f'
-
                         echo '${params.emissaryRelease}' > emissary_release.txt
                         git add emissary_release.txt
                         git commit -m "feat: use emissary ${params.emissaryRelease}"
                         git pull --rebase
-                        git push origin \$(git rev-parse HEAD):${env.GIT_BRANCH}
+                        git push
                         """
                     }
                 }
             }
         }
 
-        stage('Build and release') {
+        stage('Build') {
             steps {
                 script {
                     withCredentials([

Makefile

@@ -22,7 +22,7 @@ IMAGEBUILDER_CUSTOM_FILES_DIR_PATH := $(IMAGEBUILDER_DIR_PATH)/files
 
 BIN_DIR := "$(shell readlink -f bin)/$(OPENWRT_VERSION)/$(OPENWRT_TARGET)/$(OPENWRT_PROFILE)$(BIN_DIR_NAME_SUFFIX)"
 
-EMISSARY_RELEASE ?= $(shell cat emissary_release.txt)
+GITEA_DOWNLOAD_RELEASE_NAME ?= $(shell cat emissary_release.txt)
 EMISSARY_ARCH ?= armv6
 
 EMISSARY_RECONCILIATION_INTERVAL ?=
@@ -109,8 +109,8 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
-		GITEA_RELEASE_BODY="With Emissary $(EMISSARY_RELEASE)" \
+		GITEA_RELEASE_BODY="" \
-		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
+		GITEA_RELEASE_ATTACHMENTS="$(shell find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh
 
 .PHONY: download-emissary-release
@@ -119,7 +119,7 @@ download-emissary-release: tools/gitea-download/bin/gitea-download.sh
 	GITEA_DOWNLOAD_PROJECT="emissary" \
 		GITEA_DOWNLOAD_ORG="arcad" \
 		GITEA_DOWNLOAD_BASE_URL="https://forge.cadoles.com" \
-		GITEA_DOWNLOAD_RELEASE_NAME="$(EMISSARY_RELEASE)" \
+		GITEA_DOWNLOAD_RELEASE_NAME="$(GITEA_DOWNLOAD_RELEASE_NAME)" \
 		GITEA_DOWNLOAD_ATTACHMENTS_FILTER="\.tar\.gz$$" \
 		tools/gitea-download/bin/gitea-download.sh
 

emissary_release.txt

@@ -1 +1 @@
-v2023.4.20-3d01cf0
+v2023.3.29-e5b6c5e

install/turris-omnia.mk

@@ -1,3 +0,0 @@
-install-turris-omnia-uci-defaults:
-	mkdir -p files/etc/uci-defaults
-	cp misc/turris/omnia/uci-defaults/* files/etc/uci-defaults/

misc/emissary/keep.d/emissary

@@ -1,3 +1,4 @@
 /etc/machine-id
 /data/emissary/agent-key.json
+/data/emissary/agent-state.json
 /data/emissary/apps/data

misc/turris/omnia/uci-defaults/99-resize-disk.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# set -eo pipefail
-
-# FLAG_FILE=/root/.disk_resized
-
-# if [ -f "$FLAG_FILE" ]; then
-#     exit
-# fi
-
-# DISK=/dev/mmcblk0
-# PARTITION="${DISK}p2"
-
-# parted -s -a opt "$DISK" "resizepart 2 100%"
-
-# FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' | grep -o '[0-9][0-9]*')"
-# FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)"
-# LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")"
-
-# e2fsck -y -f "$LOOP_DEVICE"
-# resize2fs "$LOOP_DEVICE"
-
-# touch "$FLAG_FILE"
-
-# reboot

targets/turris.mk

@@ -4,8 +4,7 @@ turris: omnia
 
 omnia:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="install-turris-omnia-uci-defaults" \
+		ADDITIONAL_INSTALL="" \
-		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted" \
 		OPENWRT_TARGET="mvebu/cortexa9" \
 		EMISSARY_ARCH="armv7" \
 		OPENWRT_PROFILE="cznic_turris-omnia" \