Fixing tests
This commit is contained in:
parent
b95425b976
commit
ef600bfc78
|
@ -1,6 +1,6 @@
|
||||||
ARG SCHEME=chibi
|
ARG SCHEME=chibi
|
||||||
ARG IMAGE=chibi:head
|
ARG IMAGE=chibi:head
|
||||||
FROM schemers/${IMAGE}
|
FROM docker.io/schemers/${IMAGE}
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
make \
|
make \
|
||||||
|
|
|
@ -17,7 +17,7 @@ pipeline {
|
||||||
stage('Test R6RS implementations') {
|
stage('Test R6RS implementations') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def r6rs_implementations = sh(script: 'docker run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r6rs-schemes"', returnStdout: true).split()
|
def r6rs_implementations = sh(script: 'podman run docker.io/retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r6rs-schemes"', returnStdout: true).split()
|
||||||
parallel r6rs_implementations.collectEntries { SCHEME ->
|
parallel r6rs_implementations.collectEntries { SCHEME ->
|
||||||
[(SCHEME): {
|
[(SCHEME): {
|
||||||
stage("${SCHEME} R6RS") {
|
stage("${SCHEME} R6RS") {
|
||||||
|
@ -26,8 +26,8 @@ pipeline {
|
||||||
if("${SCHEME}" == "chicken") {
|
if("${SCHEME}" == "chicken") {
|
||||||
DOCKERIMG="chicken:5"
|
DOCKERIMG="chicken:5"
|
||||||
}
|
}
|
||||||
sh "docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ."
|
sh "podman build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ."
|
||||||
sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r6rs\""
|
sh "podman run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r6rs\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ pipeline {
|
||||||
stage('Test R7RS implementations') {
|
stage('Test R7RS implementations') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def r7rs_implementations = sh(script: 'docker run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split()
|
def r7rs_implementations = sh(script: 'podman run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split()
|
||||||
parallel r7rs_implementations.collectEntries { SCHEME ->
|
parallel r7rs_implementations.collectEntries { SCHEME ->
|
||||||
[(SCHEME): {
|
[(SCHEME): {
|
||||||
stage("${SCHEME} R7RS") {
|
stage("${SCHEME} R7RS") {
|
||||||
|
@ -49,8 +49,8 @@ pipeline {
|
||||||
if("${SCHEME}" == "chicken") {
|
if("${SCHEME}" == "chicken") {
|
||||||
DOCKERIMG="chicken:5"
|
DOCKERIMG="chicken:5"
|
||||||
}
|
}
|
||||||
sh "docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ."
|
sh "podman build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ."
|
||||||
sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r7rs\""
|
sh "podman run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r7rs\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue