From 3e2f06780b7c577255ebfb3944ea5514932c4f2b Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sat, 4 Jul 2026 12:56:38 +0300
Subject: [PATCH] Fix Jenkins tests

---
 Dockerfile.jenkins | 10 +++++-----
 Jenkinsfile        | 18 +++++++++---------
 Makefile           |  6 ++++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins
index bd05279..6a2a454 100644
--- a/Dockerfile.jenkins
+++ b/Dockerfile.jenkins
@@ -1,5 +1,5 @@
-FROM alpine
-RUN apk add make git docker
-RUN git clone https://codeberg.org/retropikzel/test-r7rs.git --depth=8 --branch=bugfixes
-RUN cd test-r7rs && ./configure && make && make install
-COPY --from=schemers/chibi:alpine-head /usr/local /usr/local
+FROM schemers/chibi:head
+RUN apt-get update && apt-get install -y \
+    gcc ca-certificates libffi-dev docker.io make
+ARG timestamp=0
+RUN snow-chibi install --impls=chibi retropikzel.test-r7rs && echo "$timestamp"
diff --git a/Jenkinsfile b/Jenkinsfile
index ce6cb3a..172ab95 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
         dockerfile {
             label 'docker-x86_64'
             filename 'Dockerfile.jenkins'
-            args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock'
+            args '-t --user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock'
             reuseNode true
         }
     }
@@ -13,19 +13,19 @@ pipeline {
         buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
     }
 
-    parameters {
-        string(name: 'R6RS_SCHEMES', defaultValue: 'capyscheme chezscheme guile ikarus ironscheme loko mosh racket sagittarius ypsilon', description: '')
-        string(name: 'R7RS_SCHEMES', defaultValue: 'capyscheme chibi chicken cyclone foment gauche gambit guile kawa loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon', description: '')
-        string(name: 'LIBRARIES', defaultValue: 'ctrf mouth string url-encoding leb128', description: '')
+    environment {
+        R6RS_SCHEMES='capyscheme chezscheme guile ikarus ironscheme loko mosh racket sagittarius ypsilon'
+        R7RS_SCHEMES='capyscheme chibi chicken cyclone foment gauche gambit guile kawa loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon'
+        LIBRARIES='ctrf mouth string url-encoding leb128'
     }
 
     stages {
         stage('R6RS tests') {
             steps {
                 script {
-                    params.LIBRARIES.split().each { LIBRARY ->
+                    env.LIBRARIES.split().each { LIBRARY ->
                         stage("${LIBRARY}") {
-                            params.R6RS_SCHEMES.split().each { SCHEME ->
+                            env.R6RS_SCHEMES.split().each { SCHEME ->
                                 stage("${SCHEME}") {
                                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs test-docker"
@@ -40,9 +40,9 @@ pipeline {
         stage('R7RS tests') {
             steps {
                 script {
-                    params.LIBRARIES.split().each { LIBRARY ->
+                    env.LIBRARIES.split().each { LIBRARY ->
                         stage("${LIBRARY}") {
-                            params.R7RS_SCHEMES.split().each { SCHEME ->
+                            env.R7RS_SCHEMES.split().each { SCHEME ->
                                 stage("${SCHEME}") {
                                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs test-docker"
diff --git a/Makefile b/Makefile
index fe640d9..7921c22 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,12 @@ package: retropikzel/${LIBRARY}/LICENSE retropikzel/${LIBRARY}/VERSION retropikz
 		--description="${DESCRIPTION}" \
 		${LIBRARY_FILE}
 
+${PKG}: package
+
 install:
 	snow-chibi install --impls=${SCHEME} ${PKG}
 
-testfiles: package ${TESTFILE}
+testfiles: ${PKG} ${TESTFILE}
 	rm -rf ${tmpdir}
 	mkdir -p ${tmpdir}
 	cp ${PKG} ${tmpdir}
@@ -48,7 +50,7 @@ test: testfiles
 	cd ${tmpdir} && COMPILE_R7RS=${SCHEME} CSC_OPIONS="-L -lcurl" compile-r7rs -o test-program -I . test.${SFX}
 	cd ${tmpdir} && ./test-program
 
-test-docker: package testfiles
+test-docker: testfiles
 	SNOW_PACKAGES="srfi.64 ${PKG}" \
 	APT_PACKAGES="libcurl4-openssl-dev" \
 	AKKU_PACKAGES="akku-r7rs" \