Compare commits

...

6 Commits

Author SHA1 Message Date
03be79d149 TEST: Run with docker cp instead of mounting
All checks were successful
Zabbix APK Builder / check-version (push) Successful in 13s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Has been skipped
Zabbix APK Builder / deploy-test (push) Has been skipped
2025-09-04 18:20:53 +02:00
1112e15d80 TEST: One more run
All checks were successful
Zabbix APK Builder / check-version (push) Successful in 10s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Successful in 5m12s
Zabbix APK Builder / deploy-test (push) Successful in 7s
2025-09-04 18:08:26 +02:00
0c86b453a6 TEST: One more time :D
All checks were successful
Zabbix APK Builder / check-version (push) Successful in 11s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Successful in 5m19s
Zabbix APK Builder / deploy-test (push) Successful in 6s
2025-09-04 17:55:19 +02:00
882755ffc8 FIX: Remove last line
All checks were successful
Zabbix APK Builder / check-version (push) Successful in 10s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Successful in 5m15s
Zabbix APK Builder / deploy-test (push) Successful in 8s
2025-09-04 17:44:51 +02:00
2854955c74 TEST: Adjusted workflow
Some checks failed
Zabbix APK Builder / check-version (push) Successful in 10s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Failing after 13s
Zabbix APK Builder / deploy-test (push) Has been skipped
2025-09-04 17:42:30 +02:00
fa06beefdd TEST: Older artifacts
All checks were successful
Zabbix APK Builder / check-version (push) Successful in 11s
Zabbix APK Builder / update-version (push) Has been skipped
Zabbix APK Builder / build-packages (push) Successful in 5m46s
Zabbix APK Builder / deploy-test (push) Successful in 12s
2025-09-04 17:29:48 +02:00
2 changed files with 48 additions and 22 deletions

View File

@@ -200,12 +200,10 @@ jobs:
find packages -name "*.apk" -exec bash -c 'echo "Package: $(basename "$1")"; echo "Size: $(du -h "$1" | cut -f1)"; echo "---"' _ {} \; find packages -name "*.apk" -exec bash -c 'echo "Package: $(basename "$1")"; echo "Size: $(du -h "$1" | cut -f1)"; echo "---"' _ {} \;
- name: Upload packages as artifacts - name: Upload packages as artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3
with: with:
name: zabbix-apk-packages-${{ gitea.run_number }} name: zabbix-apk-packages-${{ gitea.run_number }}
path: | path: zabbix-apk-builder/packages/**/*.apk
zabbix-apk-builder/packages/**/*.apk
!zabbix-apk-builder/packages/**/APKINDEX.tar.gz
retention-days: 30 retention-days: 30
if-no-files-found: error if-no-files-found: error
@@ -216,9 +214,9 @@ jobs:
steps: steps:
- name: Download packages - name: Download packages
uses: actions/download-artifact@v4 uses: actions/download-artifact@v3
with: with:
name: zabbix-apk-packages name: zabbix-apk-packages-${{ gitea.run_number }}
path: packages/ path: packages/
- name: Test deployment in Alpine container - name: Test deployment in Alpine container
@@ -227,34 +225,58 @@ jobs:
echo "=== Testing package installation ===" echo "=== Testing package installation ==="
# Verify packages were downloaded # Debug: Show what was actually downloaded
if [[ ! -d "packages" ]] || [[ -z "$(ls -A packages/ 2>/dev/null)" ]]; then echo "Downloaded packages:"
echo "ERROR: No packages found for testing" ls -la packages/
exit 1 echo "Builder directory:"
fi ls -la packages/builder/ 2>/dev/null || echo "No builder directory"
echo "x86_64 directory:"
ls -la packages/builder/x86_64/ 2>/dev/null || echo "No x86_64 directory"
echo "All .apk files:"
find packages/ -name "*.apk" -type f 2>/dev/null || echo "No .apk files found"
# Use known paths - packages are uploaded from zabbix-apk-builder/packages/**/*.apk
# and downloaded to packages/, so they should be in packages/builder/x86_64/
PACKAGE_DIR="packages/builder/x86_64"
AGENT_PKG="$PACKAGE_DIR/zabbix-agent-7.4.2-r0.apk"
PROXY_PKG="$PACKAGE_DIR/zabbix-proxy-7.4.2-r0.apk"
# Test agent package # Test agent package
if ls packages/zabbix-agent-*.apk >/dev/null 2>&1; then if [[ -f "$AGENT_PKG" ]]; then
echo "Testing agent package..." echo "Testing agent package at: $AGENT_PKG"
docker run --rm -v "${PWD}/packages:/packages" alpine:latest sh -c " echo "File size: $(du -h "$AGENT_PKG")"
apk add --allow-untrusted /packages/zabbix-agent-*.apk
# Create container, copy package, install and test
CONTAINER_ID=$(docker run -d alpine:latest sleep 30)
docker cp "$AGENT_PKG" "$CONTAINER_ID:/$(basename "$AGENT_PKG")"
docker exec "$CONTAINER_ID" sh -c "
ls -la /$(basename "$AGENT_PKG")
apk add --allow-untrusted /$(basename "$AGENT_PKG")
which zabbix_agentd which zabbix_agentd
zabbix_agentd --version zabbix_agentd --version
" && echo "✅ Agent test passed" || echo "❌ Agent test failed" " && echo "✅ Agent test passed" || echo "❌ Agent test failed"
docker rm -f "$CONTAINER_ID" >/dev/null
else else
echo "⚠️ No agent package found" echo "⚠️ Agent package not found at $AGENT_PKG"
fi fi
# Test proxy package # Test proxy package
if ls packages/zabbix-proxy-*.apk >/dev/null 2>&1; then if [[ -f "$PROXY_PKG" ]]; then
echo "Testing proxy package..." echo "Testing proxy package at: $PROXY_PKG"
docker run --rm -v "${PWD}/packages:/packages" alpine:latest sh -c " echo "File size: $(du -h "$PROXY_PKG")"
apk add --allow-untrusted /packages/zabbix-proxy-*.apk
# Create container, copy package, install and test
CONTAINER_ID=$(docker run -d alpine:latest sleep 30)
docker cp "$PROXY_PKG" "$CONTAINER_ID:/$(basename "$PROXY_PKG")"
docker exec "$CONTAINER_ID" sh -c "
ls -la /$(basename "$PROXY_PKG")
apk add --allow-untrusted /$(basename "$PROXY_PKG")
which zabbix_proxy which zabbix_proxy
zabbix_proxy --version zabbix_proxy --version
" && echo "✅ Proxy test passed" || echo "❌ Proxy test failed" " && echo "✅ Proxy test passed" || echo "❌ Proxy test failed"
docker rm -f "$CONTAINER_ID" >/dev/null
else else
echo "⚠️ No proxy package found" echo "⚠️ Proxy package not found at $PROXY_PKG"
fi fi
echo "✅ Package deployment test completed" echo "✅ Package deployment test completed"

View File

@@ -138,7 +138,11 @@ proxy() {
install -dm755 "$subpkgdir"/var/log/zabbix install -dm755 "$subpkgdir"/var/log/zabbix
install -dm755 "$subpkgdir"/var/run/zabbix install -dm755 "$subpkgdir"/var/run/zabbix
} }
# --- TEST ---
sha512sums=" sha512sums="
SKIP SKIP
SKIP
SKIP
SKIP
SKIP
" "