Skip to content

Bump version to 0.5.0 and move ci-scripts to /root directory #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phracek merged 1 commit into from
Jan 23, 2026
+8 −12
Merged

Bump version to 0.5.0 and move ci-scripts to /root directory #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
dockerfile: Dockerfile.daily-tests
tag: "0.4.0"
tag: "0.5.0"
image_name: "upstream-daily-tests"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
8 changes: 3 additions & 5 deletions Dockerfile.daily-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42

ENV WORK_DIR="/var/tmp" \
VERSION="42" \
RELEASE="0.4.0" \
RELEASE_UPSTREAM="0.5.0" \
DOWNSTREAM_TMT_DIR="sclorg-tmt-plans" \
UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
UPSTREAM_TMT_DIR="sclorg-testing-farm" \
Expand All @@ -26,9 +26,7 @@ RUN dnf install -y python3.13-pip git && \

RUN git clone "${UPSTREAM_TMT_REPO}" "${WORK_DIR}/${UPSTREAM_TMT_DIR}"

COPY . /ci-scripts
COPY . /root/ci-scripts
WORKDIR "${HOME}"

USER 500

CMD ["/ci-scripts/run_nightly_tests.sh"]
CMD ["/root/ci-scripts/run_nightly_tests.sh"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ shellcheck:
./run-shellcheck.sh `git ls-files *.sh`

build_images:
podman build -t quay.io/sclorg/upstream-daily-tests:latest -f Dockerfile.daily-tests .
podman build -t quay.io/sclorg/upstream-daily-tests:0.5.0 -f Dockerfile.daily-tests .
8 changes: 3 additions & 5 deletions run_nightly_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function get_compose() {
COMPOSE="1MT-RHEL-10.0"
TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
elif [[ "$TARGET" == "fedora" ]]; then
COMPOSE="1MT-Fedora-42"
COMPOSE="1MT-Fedora-${VERSION}"
TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
TFT_PLAN="nightly-container-f"
elif [[ "$TARGET" == "c9s" ]]; then
Expand All @@ -81,10 +81,8 @@ function get_compose() {
}

function run_tests() {
ENV_VARIABLES="-e DEBUG=yes -e SCRIPT=$SCRIPT -e OS=$TARGET"
if [[ "$TESTS" == "test-upstream" ]]; then
ENV_VARIABLES="$ENV_VARIABLES -e TEST=$TESTS"
else
ENV_VARIABLES="-e DEBUG=yes -e SCRIPT=$SCRIPT -e OS=$TARGET -e TEST=$TESTS"
if [[ "$TESTS" != "test-upstream" ]]; then
ENV_VARIABLES="$ENV_VARIABLES -e SET_TEST=$SET_TEST"
fi
TMT_COMMAND="tmt run -v -v -d -d --all ${ENV_VARIABLES} --id ${DIR} plan --name $TFT_PLAN provision --how minute --auto-select-network --image ${COMPOSE}"
Expand Down