Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
dockerfile: Dockerfile.daily-tests
tag: "0.10.1"
tag: "0.10.3"
image_name: "upstream-daily-tests"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}

Expand All @@ -31,6 +31,6 @@ jobs:
registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
dockerfile: Dockerfile.eol-checker
tag: "0.10.2"
tag: "0.10.3"
image_name: "upstream-eol-checker"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
2 changes: 1 addition & 1 deletion Dockerfile.daily-tests
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42

ENV SHARED_DIR="/var/ci-scripts" \
VERSION="42" \
RELEASE_UPSTREAM="0.10.1" \
RELEASE_UPSTREAM="0.10.3" \
UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
UPSTREAM_TMT_DIR="sclorg-testing-farm" \
HOME="/home/nightly" \
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.eol-checker
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM quay.io/fedora/fedora:42

ENV VERSION="42" \
RELEASE_UPSTREAM="0.10.2" \
RELEASE_UPSTREAM="0.10.3" \
HOME="/home/eol-checker" \
SUMMARY="EOL checker for SCL org projects" \
DESCRIPTION="This image is used to run EOL checker for SCL org projects in CI." \
NAME="eol-checker" \
WORK_DIR="/home/eol-checker/eol-checker"
HOME="/home/eol-checker" \
WORK_DIR="/home/nightly/ci-scripts"
Comment thread
phracek marked this conversation as resolved.

LABEL summary="${SUMMARY}" \
description="${DESCRIPTION}" \
Expand All @@ -15,7 +16,7 @@ LABEL summary="${SUMMARY}" \
io.k8s.vendor="SCL org" \
architecture="x86_64"

RUN dnf install -y python3.13-pip git && \
RUN dnf install -y python3.13-pip git nss_wrapper && \
dnf clean all

COPY requirements.sh requirements.txt "${WORK_DIR}"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ shellcheck:
./run-shellcheck.sh `git ls-files *.sh`

build_images:
podman build -t quay.io/sclorg/upstream-daily-tests:0.10.1 -f Dockerfile.daily-tests .
podman build -t quay.io/sclorg/upstream-eol-checker:0.10.2 -f Dockerfile.eol-checker .
podman build -t quay.io/sclorg/upstream-daily-tests:0.10.3 -f Dockerfile.daily-tests .
podman build -t quay.io/sclorg/upstream-eol-checker:0.10.3 -f Dockerfile.eol-checker .
9 changes: 0 additions & 9 deletions eol-checker/eol_checker/custom_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,7 @@ def setup_logger(logger_name: str = "eol_checker", level=logging.INFO):
console_handler.setLevel(level)
console_handler.setFormatter(ColoredFormatter())

# Create a file handler
file_handler = logging.FileHandler("eol_checker.log")
file_handler.setLevel(logging.DEBUG)
file_formatter = logging.Formatter(
"%(asctime)s - %(levelname)s - %(name)s - %(message)s"
)
file_handler.setFormatter(file_formatter)

logger.addHandler(console_handler)
logger.addHandler(file_handler)
logger.setLevel(level=logging.DEBUG)

return logger
Loading