From 4458d510dbe70cae4f2bf10320a17ad14df65b1e Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 26 Aug 2023 16:44:20 +0100
Subject: [PATCH] Try using the float-runner based container-test
---
.gitlab-ci.yml | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b4fa2f7..1072abdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,20 +3,13 @@ include: "https://git.autistici.org/pipelines/containers/raw/master/common.yml"
# test the newly built container before releasing it.
test:
stage: container-test
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/debian:stable
- tags: [docker-in-docker]
- services:
- - name: ${IMAGE_TAG}
- alias: noblogs
- - name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/mysql:latest
- alias: mysql
+ image: registry.git.autistici.org/pipelines/images/test/float-podman-runner:master
+ tags: [podman]
variables:
APACHE_PORT: 8080
- SITE_URL: "http://noblogs:8080"
- MYSQL_DATABASE: noblogstest
- MYSQL_ROOT_PASSWORD: changeme
- PHP_FPM_USER: www-data
+ SITE_URL: "http://localhost:8080"
+ before_script:
+ - echo -n "$CI_JOB_TOKEN" | podman login -u gitlab-ci-token --password-stdin $CI_REGISTRY
script:
- - apt -q update
- - env DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install curl
- - "curl -H 'Host: noblogs.org' -v ${SITE_URL}"
+ - with-container --expose=8080 $IMAGE_TAG ./docker/test.sh
+
--
GitLab