Skip to content

Commit e0bc91a

Browse files
committed
updating the CI logic to be compatible with the latest test container
1 parent 25eea18 commit e0bc91a

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Diff for: Jenkinsfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ pipeline {
3030
tar'
3131
MULTIARCH = 'true'
3232
CI = 'true'
33+
CI_WEB = 'true'
3334
CI_PORT = '80'
3435
CI_SSL = 'false'
35-
CI_DELAY = '5'
36+
CI_DELAY = '10'
3637
TEST_MYSQL_HOST = credentials('mysql_test_host')
3738
TEST_MYSQL_PASSWORD = credentials('mysql_test_password')
3839
CI_AUTH = 'user:password'
@@ -173,6 +174,9 @@ pipeline {
173174
environment name: 'MULTIARCH', value: 'true'
174175
}
175176
steps {
177+
sh "wget https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static"
178+
sh "wget https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static"
179+
sh "chmod +x qemu-*"
176180
sh "docker build --no-cache -f Dockerfile.amd64 -t ${DOCKERHUB_IMAGE}:amd64-${EXT_RELEASE}-ls${LS_TAG_NUMBER} \
177181
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
178182
sh "docker build --no-cache -f Dockerfile.armhf -t ${DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-ls${LS_TAG_NUMBER} \
@@ -274,7 +278,7 @@ pipeline {
274278
string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
275279
]) {
276280
sh '''#! /bin/bash
277-
docker pull lsiodev/ci
281+
docker pull lsiodev/ci:latest
278282
docker run --rm \
279283
-v /var/run/docker.sock:/var/run/docker.sock \
280284
-e IMAGE=\"${CI_IMAGE}\" \
@@ -287,6 +291,7 @@ pipeline {
287291
-e SECRET_KEY=\"${DO_SECRET}\" \
288292
-e ACCESS_KEY=\"${DO_KEY}\" \
289293
-e DOCKER_ENV=\"DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}\" \
294+
-e WEB_SCREENSHOT=\"${CI_WEB}\" \
290295
-e WEB_AUTH=\"${CI_AUTH}\" \
291296
-e WEB_PATH=\"${CI_WEBPATH}\" \
292297
-e DO_REGION="ams3" \

Diff for: qemu-aarch64-static

-3.65 MB
Binary file not shown.

Diff for: qemu-arm-static

-3.53 MB
Binary file not shown.

0 commit comments

Comments
 (0)