Compare commits
10
Commits
v2.1.0
...
ef002b2fce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef002b2fce | ||
|
|
f1489ba8a8 | ||
|
|
36d9692086 | ||
|
|
4416ebd924 | ||
|
|
acaf91a301 | ||
|
|
2213a0655d | ||
|
|
6248b7f721 | ||
|
|
e1668dd42d | ||
|
|
d15cc8d95c | ||
|
|
708d56fc98 |
No files matched your search
-59
@@ -1,59 +0,0 @@
|
|||||||
kind: pipeline
|
|
||||||
name: default
|
|
||||||
steps:
|
|
||||||
- name: docker
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
registry: git.jonb.io
|
|
||||||
dry_run: false
|
|
||||||
username: jblu
|
|
||||||
password:
|
|
||||||
from_secret: gittea_drone
|
|
||||||
repo: git.jonb.io/jblu/qbit-maid
|
|
||||||
tags:
|
|
||||||
- latest
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- main
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- pull_request
|
|
||||||
- name: docker-test
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
registry: git.jonb.io
|
|
||||||
dry_run: false
|
|
||||||
username: jblu
|
|
||||||
password:
|
|
||||||
from_secret: gittea_drone
|
|
||||||
repo: git.jonb.io/jblu/qbit-maid
|
|
||||||
tags:
|
|
||||||
- dev
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- dev*
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- pull_request
|
|
||||||
- name: test-main
|
|
||||||
image: git.jonb.io/jblu/qbit-maid:latest
|
|
||||||
commands:
|
|
||||||
- python test_qbitmaid.py
|
|
||||||
- python test_write_csv.py
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- main
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- pull_request
|
|
||||||
- name: test-dev
|
|
||||||
image: git.jonb.io/jblu/qbit-maid:dev
|
|
||||||
commands:
|
|
||||||
- python test_qbitmaid.py
|
|
||||||
- python test_write_csv.py
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- dev*
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- pull_request
|
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Trigger a Komodo deploy and optionally wait for it to finish.
|
||||||
|
#
|
||||||
|
# Required env:
|
||||||
|
# KOMODO_URL Base URL of Komodo Core, e.g. https://k.jonb.io
|
||||||
|
# KOMODO_API_KEY Komodo API key
|
||||||
|
# KOMODO_API_SECRET Komodo API secret
|
||||||
|
# KOMODO_TARGET Stack name/id (or Procedure name/id)
|
||||||
|
#
|
||||||
|
# Optional env:
|
||||||
|
# KOMODO_TARGET_TYPE "stack" (default) or "procedure"
|
||||||
|
# KOMODO_REQUIRED "true" to fail when KOMODO_TARGET is empty
|
||||||
|
# KOMODO_WAIT "true" (default) to poll until the update completes
|
||||||
|
# KOMODO_WAIT_TIMEOUT Seconds to wait for completion (default 600)
|
||||||
|
# KOMODO_WAIT_INTERVAL Seconds between polls (default 10)
|
||||||
|
#
|
||||||
|
# Exits non-zero if the request is rejected or the deploy fails.
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
KOMODO_TARGET_TYPE="${KOMODO_TARGET_TYPE:-stack}"
|
||||||
|
KOMODO_REQUIRED="${KOMODO_REQUIRED:-false}"
|
||||||
|
KOMODO_WAIT="${KOMODO_WAIT:-true}"
|
||||||
|
KOMODO_WAIT_TIMEOUT="${KOMODO_WAIT_TIMEOUT:-600}"
|
||||||
|
KOMODO_WAIT_INTERVAL="${KOMODO_WAIT_INTERVAL:-10}"
|
||||||
|
|
||||||
|
if [ -z "${KOMODO_TARGET:-}" ]; then
|
||||||
|
if [ "$KOMODO_REQUIRED" = "true" ]; then
|
||||||
|
echo "::error::KOMODO_TARGET is empty but KOMODO_REQUIRED=true" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "KOMODO_TARGET is not set - skipping Komodo deploy."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
: "${KOMODO_URL:?KOMODO_URL is required}"
|
||||||
|
: "${KOMODO_API_KEY:?KOMODO_API_KEY is required}"
|
||||||
|
: "${KOMODO_API_SECRET:?KOMODO_API_SECRET is required}"
|
||||||
|
|
||||||
|
# Normalise: strip any trailing slash so path joins are predictable.
|
||||||
|
KOMODO_URL="${KOMODO_URL%/}"
|
||||||
|
|
||||||
|
case "$KOMODO_TARGET_TYPE" in
|
||||||
|
stack)
|
||||||
|
EXECUTE="DeployStack"
|
||||||
|
PARAMS="{\"stack\": \"${KOMODO_TARGET}\"}"
|
||||||
|
;;
|
||||||
|
procedure)
|
||||||
|
EXECUTE="RunProcedure"
|
||||||
|
PARAMS="{\"procedure\": \"${KOMODO_TARGET}\"}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "::error::KOMODO_TARGET_TYPE must be 'stack' or 'procedure', got '${KOMODO_TARGET_TYPE}'" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
tmp=$(mktemp)
|
||||||
|
trap 'rm -f "$tmp"' EXIT
|
||||||
|
|
||||||
|
# api <path> <json-body> -> writes body to $tmp, echoes HTTP status code
|
||||||
|
api() {
|
||||||
|
curl -sS -o "$tmp" -w '%{http_code}' \
|
||||||
|
-X POST "${KOMODO_URL}$1" \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-H "x-api-key: ${KOMODO_API_KEY}" \
|
||||||
|
-H "x-api-secret: ${KOMODO_API_SECRET}" \
|
||||||
|
-d "$2"
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Requesting ${EXECUTE} for '${KOMODO_TARGET}' on ${KOMODO_URL}"
|
||||||
|
|
||||||
|
if ! code=$(api "/execute/${EXECUTE}" "$PARAMS"); then
|
||||||
|
echo "::error::Could not reach Komodo at ${KOMODO_URL}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
body=$(cat "$tmp")
|
||||||
|
|
||||||
|
if [ "$code" != "200" ]; then
|
||||||
|
echo "::error::Komodo rejected ${EXECUTE} for '${KOMODO_TARGET}' (HTTP ${code})" >&2
|
||||||
|
echo "$body" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Komodo accepted the request (HTTP 200)."
|
||||||
|
|
||||||
|
# The execute endpoint returns immediately with an Update; the deploy itself
|
||||||
|
# runs asynchronously. Poll /read/GetUpdate until it reaches a terminal state.
|
||||||
|
if [ "$KOMODO_WAIT" != "true" ]; then
|
||||||
|
echo "KOMODO_WAIT is not 'true' - not waiting for completion."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v python3 >/dev/null 2>&1; then
|
||||||
|
echo "python3 not available - cannot poll for completion. Deploy was queued."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
update_id=$(printf '%s' "$body" | python3 -c '
|
||||||
|
import json, sys
|
||||||
|
d = json.load(sys.stdin)
|
||||||
|
print(d.get("_id", {}).get("$oid", ""))
|
||||||
|
' 2>/dev/null || true)
|
||||||
|
|
||||||
|
if [ -z "$update_id" ]; then
|
||||||
|
echo "Could not read update id from response - not polling. Deploy was queued."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Waiting for update ${update_id} (timeout ${KOMODO_WAIT_TIMEOUT}s)..."
|
||||||
|
|
||||||
|
elapsed=0
|
||||||
|
while [ "$elapsed" -lt "$KOMODO_WAIT_TIMEOUT" ]; do
|
||||||
|
sleep "$KOMODO_WAIT_INTERVAL"
|
||||||
|
elapsed=$((elapsed + KOMODO_WAIT_INTERVAL))
|
||||||
|
|
||||||
|
if ! code=$(api "/read/GetUpdate" "{\"id\": \"${update_id}\"}"); then
|
||||||
|
echo "::warning::Could not reach Komodo while polling; retrying." >&2
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$code" != "200" ]; then
|
||||||
|
echo "::warning::GetUpdate returned HTTP ${code}; retrying." >&2
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
status=$(python3 -c '
|
||||||
|
import json, sys
|
||||||
|
print(json.load(sys.stdin).get("status", ""))
|
||||||
|
' < "$tmp" 2>/dev/null || true)
|
||||||
|
|
||||||
|
case "$status" in
|
||||||
|
Complete)
|
||||||
|
if python3 -c '
|
||||||
|
import json, sys
|
||||||
|
sys.exit(0 if json.load(sys.stdin).get("success") else 1)
|
||||||
|
' < "$tmp" 2>/dev/null; then
|
||||||
|
echo "Deploy of '${KOMODO_TARGET}' completed successfully."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "::error::Deploy of '${KOMODO_TARGET}' failed. Komodo update log:" >&2
|
||||||
|
python3 -c '
|
||||||
|
import json, sys
|
||||||
|
d = json.load(sys.stdin)
|
||||||
|
for log in d.get("logs", []):
|
||||||
|
print(f" [{log.get(\"stage\", \"\")}] {log.get(\"msg\", \"\")}")
|
||||||
|
' < "$tmp" >&2 2>/dev/null || cat "$tmp" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
Queued|InProgress)
|
||||||
|
echo " ${elapsed}s: ${status}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo " ${elapsed}s: unexpected status '${status}'"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "::error::Timed out after ${KOMODO_WAIT_TIMEOUT}s waiting for update ${update_id}" >&2
|
||||||
|
exit 1
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
name: ci
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- dev*
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
-
|
||||||
|
name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v4
|
||||||
|
with:
|
||||||
|
registry: git.jonb.io
|
||||||
|
username: '${{ gitea.actor }}'
|
||||||
|
password: '${{ secrets.JONBIO_CI }}'
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v4
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v4
|
||||||
|
-
|
||||||
|
name: Build and push
|
||||||
|
uses: docker/build-push-action@v7
|
||||||
|
with:
|
||||||
|
push: true
|
||||||
|
tags: git.jonb.io/jblu/qbit-maid:dev
|
||||||
|
-
|
||||||
|
name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
-
|
||||||
|
name: Deploy to Komodo
|
||||||
|
env:
|
||||||
|
KOMODO_URL: '${{ secrets.KOMODO_URL }}'
|
||||||
|
KOMODO_API_KEY: '${{ secrets.KOMODO_API_KEY }}'
|
||||||
|
KOMODO_API_SECRET: '${{ secrets.KOMODO_API_SECRET }}'
|
||||||
|
# Set the KOMODO_STACK_DEV repository variable to your dev stack name.
|
||||||
|
# When it is empty the deploy step is skipped, so dev builds still pass.
|
||||||
|
KOMODO_TARGET: '${{ vars.KOMODO_STACK_DEV }}'
|
||||||
|
run: ./.gitea/scripts/komodo-deploy.sh
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
name: ci
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
-
|
||||||
|
name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v4
|
||||||
|
with:
|
||||||
|
registry: git.jonb.io
|
||||||
|
username: '${{ gitea.actor }}'
|
||||||
|
password: '${{ secrets.JONBIO_CI }}'
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v4
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v4
|
||||||
|
-
|
||||||
|
name: Build and push
|
||||||
|
uses: docker/build-push-action@v7
|
||||||
|
with:
|
||||||
|
push: true
|
||||||
|
tags: git.jonb.io/jblu/qbit-maid:latest
|
||||||
|
-
|
||||||
|
name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
-
|
||||||
|
name: Deploy to Komodo
|
||||||
|
env:
|
||||||
|
KOMODO_URL: '${{ secrets.KOMODO_URL }}'
|
||||||
|
KOMODO_API_KEY: '${{ secrets.KOMODO_API_KEY }}'
|
||||||
|
KOMODO_API_SECRET: '${{ secrets.KOMODO_API_SECRET }}'
|
||||||
|
KOMODO_TARGET: 'qbit-maid'
|
||||||
|
KOMODO_REQUIRED: 'true'
|
||||||
|
run: ./.gitea/scripts/komodo-deploy.sh
|
||||||
+3
-5
@@ -1,8 +1,6 @@
|
|||||||
FROM python:alpine3.18
|
FROM python:alpine3.23
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY . opt
|
COPY *.py entrypoint.sh /opt/
|
||||||
RUN apk add --no-cache supercronic
|
RUN pip install requests qbittorrent-api
|
||||||
RUN pip install requests
|
|
||||||
RUN pip install qbittorrent-api
|
|
||||||
RUN chmod +x /opt/entrypoint.sh
|
RUN chmod +x /opt/entrypoint.sh
|
||||||
CMD ["/opt/entrypoint.sh"]
|
CMD ["/opt/entrypoint.sh"]
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
|
|
||||||
# qbit-maid
|
# qbit-maid
|
||||||
> Warning: This application removes torrents that are over the minimum age and that are not part of the ignored categories, domains or tags. Please use the delete_torrents feature set to false when first testing its functionality.
|
> Warning: This application removes torrents that are over the minimum age and that are not part of the ignored categories, domains or tags. Please use the delete_torrents feature set to false when first testing its functionality.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
The objective is to remove torrents based on the following criteria:
|
The objective is to remove torrents based on the following criteria:
|
||||||
- tracker domain name
|
- tracker domain name
|
||||||
@@ -13,15 +12,15 @@ The objective is to remove torrents based on the following criteria:
|
|||||||
## Install
|
## Install
|
||||||
### Docker(Recommended)
|
### Docker(Recommended)
|
||||||
|
|
||||||
[package ](https://git.jbranan.com/jblu/-/packages/container/qbit-maid/latest)
|
[package](https://git.jonb.io/jblu/-/packages/container/qbit-maid/latest)
|
||||||
|
|
||||||
docker pull git.jbranan.com/jblu/qbit-maid:latest
|
docker pull git.jonb.io/jblu/qbit-maid:latest
|
||||||
|
|
||||||
#### Docker Run Command:
|
#### Docker Run Command:
|
||||||
|
|
||||||
> Please note it is best practice to escape spaces in variables. That is why there is backslashes in the cron schedule.
|
> Please note it is best practice to escape spaces in variables. That is why there is backslashes in the cron schedule.
|
||||||
|
|
||||||
docker run --name qbit-maid -v /opt/qbit-maid:/config/ -e CRON=0\ 1\ *\ *\ * -e toml_path=/config/config.toml git.jbranan.com/jblu/qbit-maid
|
docker run --name qbit-maid -v /opt/qbit-maid:/config/ -e CRON=0\ 1\ *\ *\ * -e toml_path=/config/config.toml git.jonb.io/jblu/qbit-maid
|
||||||
|
|
||||||
#### Docker Compose
|
#### Docker Compose
|
||||||
|
|
||||||
@@ -29,7 +28,7 @@ The objective is to remove torrents based on the following criteria:
|
|||||||
version: '3.3'
|
version: '3.3'
|
||||||
services:
|
services:
|
||||||
qbit-maid:
|
qbit-maid:
|
||||||
image: git.jbranan.com/jblu/qbit-maid
|
image: git.jonb.io/jblu/qbit-maid
|
||||||
container_name: qbit-maid
|
container_name: qbit-maid
|
||||||
volumes:
|
volumes:
|
||||||
- /opt/qbit-maid:/config
|
- /opt/qbit-maid:/config
|
||||||
@@ -38,7 +37,7 @@ services:
|
|||||||
- toml_path=/config/config.toml
|
- toml_path=/config/config.toml
|
||||||
```
|
```
|
||||||
### Via Git
|
### Via Git
|
||||||
git clone https://git.jbranan.com/jblu/qbit-maid.git
|
git clone https://git.jonb.io/jblu/qbit-maid.git
|
||||||
|
|
||||||
Qbit-maid will look for an environment variable *toml_path* for its configuration.If it doesn't find it, it will look for a config.toml file in it's own directory.
|
Qbit-maid will look for an environment variable *toml_path* for its configuration.If it doesn't find it, it will look for a config.toml file in it's own directory.
|
||||||
##### config.toml
|
##### config.toml
|
||||||
|
|||||||
@@ -0,0 +1,143 @@
|
|||||||
|
# Auto-deploy qbit-maid to Komodo
|
||||||
|
|
||||||
|
Status: **implemented** on branch `dev-komodo-deploy`.
|
||||||
|
Komodo instance: `https://k.jonb.io` · Stack: `qbit-maid`
|
||||||
|
|
||||||
|
## What this does
|
||||||
|
|
||||||
|
Every successful image build now triggers a Komodo stack deploy:
|
||||||
|
|
||||||
|
| Workflow | Trigger | Image tag | Komodo target |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `.gitea/workflows/docker.yml` | push to `main` | `:latest` | stack `qbit-maid` |
|
||||||
|
| `.gitea/workflows/docker-dev.yml` | push to `dev*` | `:dev` | `vars.KOMODO_STACK_DEV` (skipped if unset) |
|
||||||
|
|
||||||
|
The deploy step runs **after** `Build and push`, so the new image is already in
|
||||||
|
the registry when Komodo pulls it. If the deploy fails, the workflow goes red.
|
||||||
|
|
||||||
|
## Why not just use the existing webhook?
|
||||||
|
|
||||||
|
You already have webhooks configured, and this is the important part: **a push
|
||||||
|
webhook on the stack does not reliably deploy new container builds.**
|
||||||
|
|
||||||
|
The webhook fires on `git push`. That happens *before* Gitea Actions has built
|
||||||
|
and pushed the image — the build takes minutes. So Komodo receives the deploy
|
||||||
|
request while the registry still holds the *previous* `:latest`. It pulls that,
|
||||||
|
deploys it, and reports success. The new code never lands until something else
|
||||||
|
triggers a second deploy.
|
||||||
|
|
||||||
|
The ordering is the whole problem, and a webhook cannot fix it because the
|
||||||
|
webhook is tied to the push event, not the build event.
|
||||||
|
|
||||||
|
So the workflow calls the Komodo API directly instead:
|
||||||
|
|
||||||
|
```
|
||||||
|
POST https://k.jonb.io/execute/DeployStack
|
||||||
|
x-api-key: <key>
|
||||||
|
x-api-secret: <secret>
|
||||||
|
{"stack": "qbit-maid"}
|
||||||
|
```
|
||||||
|
|
||||||
|
This is the same call the Komodo UI makes when you click **Deploy**, just
|
||||||
|
triggered from CI at the right moment.
|
||||||
|
|
||||||
|
### What to do with the existing webhook
|
||||||
|
|
||||||
|
If you have a stack webhook pointing at
|
||||||
|
`/listener/github/stack/qbit-maid/deploy`, it is now redundant and will cause a
|
||||||
|
second, useless deploy on every push (deploying the stale image). **Remove it**
|
||||||
|
in Gitea → repo Settings → Webhooks.
|
||||||
|
|
||||||
|
Keep webhooks only if you later point them at a *Procedure* rather than the
|
||||||
|
stack — see "Using a Procedure" below.
|
||||||
|
|
||||||
|
## One Komodo setting to verify
|
||||||
|
|
||||||
|
`DeployStack` runs `docker compose pull` before `up` **only when the stack has
|
||||||
|
`auto_pull` enabled**. It defaults to `true`, so this is probably already fine —
|
||||||
|
but if it has been turned off, deploys will silently reuse the cached image and
|
||||||
|
you will see no change.
|
||||||
|
|
||||||
|
Check in the Komodo UI: stack `qbit-maid` → Config → **Auto Pull** should be on.
|
||||||
|
|
||||||
|
## Setup (one-time)
|
||||||
|
|
||||||
|
### 1. Komodo API key
|
||||||
|
|
||||||
|
Komodo → **Settings → API Keys → New**. The key's user needs **Execute**
|
||||||
|
permission on the `qbit-maid` stack. Copy the key and secret — the secret is
|
||||||
|
shown once.
|
||||||
|
|
||||||
|
### 2. Gitea secrets
|
||||||
|
|
||||||
|
Repo → **Settings → Actions → Secrets**:
|
||||||
|
|
||||||
|
| Name | Value |
|
||||||
|
|---|---|
|
||||||
|
| `KOMODO_URL` | `https://k.jonb.io` |
|
||||||
|
| `KOMODO_API_KEY` | from step 1 |
|
||||||
|
| `KOMODO_API_SECRET` | from step 1 |
|
||||||
|
|
||||||
|
### 3. Dev stack (optional)
|
||||||
|
|
||||||
|
Repo → **Settings → Actions → Variables**:
|
||||||
|
|
||||||
|
| Name | Value |
|
||||||
|
|---|---|
|
||||||
|
| `KOMODO_STACK_DEV` | your dev stack name, e.g. `qbit-maid-dev` |
|
||||||
|
|
||||||
|
If this variable is unset, the dev workflow logs `KOMODO_TARGET is not set -
|
||||||
|
skipping Komodo deploy` and still passes. Dev builds never fail because of a
|
||||||
|
missing dev stack.
|
||||||
|
|
||||||
|
## The deploy script
|
||||||
|
|
||||||
|
`.gitea/scripts/komodo-deploy.sh` is shared by both workflows. It:
|
||||||
|
|
||||||
|
1. Skips cleanly if `KOMODO_TARGET` is empty (unless `KOMODO_REQUIRED=true`).
|
||||||
|
2. POSTs to `/execute/DeployStack` (or `/execute/RunProcedure`).
|
||||||
|
3. Fails on any non-200, printing Komodo's error body.
|
||||||
|
4. Polls `/read/GetUpdate` until the update reaches `Complete`, then checks
|
||||||
|
`success` and prints the Komodo log on failure.
|
||||||
|
|
||||||
|
The execute endpoint returns immediately with an `Update` object — a `200` means
|
||||||
|
"queued", not "deployed". That is why step 4 exists.
|
||||||
|
|
||||||
|
Tunable via env: `KOMODO_TARGET_TYPE` (`stack`/`procedure`), `KOMODO_WAIT`
|
||||||
|
(default `true`), `KOMODO_WAIT_TIMEOUT` (default 600s), `KOMODO_WAIT_INTERVAL`
|
||||||
|
(default 10s).
|
||||||
|
|
||||||
|
### Using a Procedure instead of a direct stack deploy
|
||||||
|
|
||||||
|
If you later wrap the deploy in a Komodo Procedure (deploy + healthcheck +
|
||||||
|
notification, say), point the workflow at it instead of editing the script:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
env:
|
||||||
|
KOMODO_TARGET_TYPE: 'procedure'
|
||||||
|
KOMODO_TARGET: 'qbit-maid deploy'
|
||||||
|
```
|
||||||
|
|
||||||
|
`RunProcedure` takes `{"procedure": "<name>"}` and returns the same `Update`
|
||||||
|
shape, so the polling logic is unchanged.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Verified locally against a mock of the Komodo API — 12 checks covering the
|
||||||
|
success path, deploy failure, bad credentials (401), unknown stack (400),
|
||||||
|
empty target skip, required-but-empty target, unreachable host, and the
|
||||||
|
procedure target type. All pass.
|
||||||
|
|
||||||
|
Live verification still needed:
|
||||||
|
|
||||||
|
1. Push `dev-komodo-deploy` — it matches `dev*`, so `docker-dev.yml` runs. With
|
||||||
|
`KOMODO_STACK_DEV` unset it will skip the deploy; set the variable first if
|
||||||
|
you want to exercise it.
|
||||||
|
2. Merge to `main` and confirm the Komodo UI shows a new `DeployStack` update
|
||||||
|
for `qbit-maid`, operator = the API key's user.
|
||||||
|
3. Confirm the running container picked up the new image digest.
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
Delete the `Deploy to Komodo` step from the workflow(s). Nothing on the Komodo
|
||||||
|
side is modified by CI beyond triggering a deploy.
|
||||||
+4
-3
@@ -1,7 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
CRON_CONFIG_FILE="/opt/crontab"
|
CRON_CONFIG_FILE="/etc/crontabs/root"
|
||||||
|
|
||||||
echo "${CRON} python /opt/qbit-maid.py" > $CRON_CONFIG_FILE
|
grep -qF 'python /opt/qbit-maid.py' $CRON_CONFIG_FILE || echo "${CRON} python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE
|
||||||
|
grep -qF '@reboot' $CRON_CONFIG_FILE || echo "@reboot python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE
|
||||||
|
|
||||||
exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE
|
exec crond -f
|
||||||
@@ -94,6 +94,11 @@ class Qbt:
|
|||||||
tor_log(self)
|
tor_log(self)
|
||||||
tor_notify(self)
|
tor_notify(self)
|
||||||
self.t = time
|
self.t = time
|
||||||
|
|
||||||
|
#start healthcheck job
|
||||||
|
if self.use_healthcheck:
|
||||||
|
send_ping(self, r, self.healthcheck_url.rstrip("/") + "/start" )
|
||||||
|
|
||||||
# Pulling domain names to treat carefully
|
# Pulling domain names to treat carefully
|
||||||
self.tracker_list = []
|
self.tracker_list = []
|
||||||
self.up_tor_counter = 0
|
self.up_tor_counter = 0
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ def get_script_runtime(self):
|
|||||||
|
|
||||||
def send_ping(self, req_obj, healthcheck_url):
|
def send_ping(self, req_obj, healthcheck_url):
|
||||||
try:
|
try:
|
||||||
req_obj.get(healthcheck_url, timeout=10)
|
req_obj.get(healthcheck_url, timeout=5)
|
||||||
except req_obj.RequestException as e:
|
except req_obj.RequestException as e:
|
||||||
self.tl.info(f"Ping failed: {e}")
|
self.tl.info(f"Ping failed: {e}")
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import unittest
|
import unittest
|
||||||
|
import requests as r
|
||||||
from qlist import is_preme,is_cat_ignored,is_tracker_blank,is_protected_tracker,is_not_protected_tracker,is_tag_blank,is_ignored_tag
|
from qlist import is_preme,is_cat_ignored,is_tracker_blank,is_protected_tracker,is_not_protected_tracker,is_tag_blank,is_ignored_tag
|
||||||
from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_protected_over_ratio,is_not_protected_tor
|
from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_protected_over_ratio,is_not_protected_tor
|
||||||
|
from qlogging import send_ping
|
||||||
|
|
||||||
class TestQbitmaid(unittest.TestCase):
|
class TestQbitmaid(unittest.TestCase):
|
||||||
def test_ispreme_sanity(self):
|
def test_ispreme_sanity(self):
|
||||||
@@ -94,6 +96,17 @@ class TestQbitmaid(unittest.TestCase):
|
|||||||
def test_isignoredtag(self):
|
def test_isignoredtag(self):
|
||||||
self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt'))
|
self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt'))
|
||||||
|
|
||||||
|
def test_sendpingstart_sanity(self):
|
||||||
|
send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb" + "/start")
|
||||||
|
url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb"
|
||||||
|
send_ping(self, r, url)
|
||||||
|
|
||||||
|
def test_sendping_start(self):
|
||||||
|
url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb/"
|
||||||
|
send_ping(self, r, url.strip("/") + "/start")
|
||||||
|
send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb")
|
||||||
|
|
||||||
|
|
||||||
# def test__sanity(self):
|
# def test__sanity(self):
|
||||||
# pass
|
# pass
|
||||||
|
|
||||||
|
|||||||
+40
-40
@@ -1,41 +1,41 @@
|
|||||||
from qprocess import write_csv
|
from qprocess import write_csv
|
||||||
import csv
|
import csv
|
||||||
import unittest
|
import unittest
|
||||||
import os
|
import os
|
||||||
# Torrent Items needed for testing
|
# Torrent Items needed for testing
|
||||||
# canidate['state'] {canidate["ratio"]} {torrent["tags"]} torrent["seeding_time"] {torrent["category"]} {torrent["name"][0:20]} {canidate["time_active"]}
|
# canidate['state'] {canidate["ratio"]} {torrent["tags"]} torrent["seeding_time"] {torrent["category"]} {torrent["name"][0:20]} {canidate["time_active"]}
|
||||||
class TestWriteCSV(unittest.TestCase):
|
class TestWriteCSV(unittest.TestCase):
|
||||||
def test_write_csv_dragnet(self):
|
def test_write_csv_dragnet(self):
|
||||||
self.cv = csv
|
self.cv = csv
|
||||||
outfile = './test_dragnet_outfile.csv'
|
outfile = './test_dragnet_outfile.csv'
|
||||||
state = 'downloading'
|
state = 'downloading'
|
||||||
ratio = 1.05
|
ratio = 1.05
|
||||||
tags = 'ipt'
|
tags = 'ipt'
|
||||||
added = 1
|
added = 1
|
||||||
age = 240000
|
age = 240000
|
||||||
time = 123456
|
time = 123456
|
||||||
thash = 'asfasdf23412adfqwer'
|
thash = 'asfasdf23412adfqwer'
|
||||||
tname = 'thisismynamehahahah'
|
tname = 'thisismynamehahahah'
|
||||||
trname = 'https://localhost.stackoverflow.tech/317332f1c125bc9c1b9b14fb8e054908/announce'
|
trname = 'https://localhost.stackoverflow.tech/317332f1c125bc9c1b9b14fb8e054908/announce'
|
||||||
header = ['state','ratio','tags','added','age','time','thash','tname','trname']
|
header = ['state','ratio','tags','added','age','time','thash','tname','trname']
|
||||||
row = [state,ratio,tags,added,age,time,thash,tname,trname]
|
row = [state,ratio,tags,added,age,time,thash,tname,trname]
|
||||||
write_csv(self.cv,outfile,header,row)
|
write_csv(self.cv,outfile,header,row)
|
||||||
self.assertTrue(os.path.exists(outfile))
|
self.assertTrue(os.path.exists(outfile))
|
||||||
|
|
||||||
def test_write_csv_telemetry(self):
|
def test_write_csv_telemetry(self):
|
||||||
self.cv = csv
|
self.cv = csv
|
||||||
outfile = './test_telemetry_outfile.csv'
|
outfile = './test_telemetry_outfile.csv'
|
||||||
state = 'downloading'
|
state = 'downloading'
|
||||||
ratio = 1.05
|
ratio = 1.05
|
||||||
tags = 'ipt'
|
tags = 'ipt'
|
||||||
added = 1
|
added = 1
|
||||||
thash = 'asfasdf23412adfqwer'
|
thash = 'asfasdf23412adfqwer'
|
||||||
tname = 'thisismynamehahahah'
|
tname = 'thisismynamehahahah'
|
||||||
trname = 'https://localhost.stackoverflow.tech/317332f1c125bc9c1b9b14fb8e054908/announce'
|
trname = 'https://localhost.stackoverflow.tech/317332f1c125bc9c1b9b14fb8e054908/announce'
|
||||||
header = ['state','ratio','tags','added','hash','name','tracker']
|
header = ['state','ratio','tags','added','hash','name','tracker']
|
||||||
row = [state,ratio,tags,added,thash,tname,trname]
|
row = [state,ratio,tags,added,thash,tname,trname]
|
||||||
write_csv(self.cv,outfile,header,row)
|
write_csv(self.cv,outfile,header,row)
|
||||||
self.assertTrue(os.path.exists(outfile))
|
self.assertTrue(os.path.exists(outfile))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
Reference in new issue
Block a user