fix: renforcer la robustesse du module et étendre les tests/CI
Co-authored-by: aider (openrouter/openai/gpt-5.3-codex) <aider@aider.chat>
This commit is contained in:
@ -24,18 +24,14 @@ build-packages:
|
||||
- docker:24-dind
|
||||
script:
|
||||
# Build all packages (DEB + RPMs for el7, el8, el9)
|
||||
- docker build -f Dockerfile.package
|
||||
--target output
|
||||
--build-arg VERSION=$VERSION
|
||||
-t mod_reqin_log:packages .
|
||||
|
||||
- docker build -f Dockerfile.package --target output --build-arg VERSION=$VERSION -t mod_reqin_log:packages .
|
||||
|
||||
# Create output directories
|
||||
- mkdir -p dist/deb dist/rpm
|
||||
|
||||
|
||||
# Extract packages from Docker image
|
||||
- docker run --rm -v $(pwd)/dist:/output mod_reqin_log:packages
|
||||
sh -c 'cp -r /packages/deb/* /output/deb/ && cp -r /packages/rpm/* /output/rpm/'
|
||||
|
||||
- docker run --rm -v $(pwd)/dist:/output mod_reqin_log:packages sh -c 'cp -r /packages/deb/* /output/deb/ && cp -r /packages/rpm/* /output/rpm/'
|
||||
|
||||
# List built packages
|
||||
- echo "=== DEB Packages ==="
|
||||
- ls -la dist/deb/
|
||||
@ -59,7 +55,7 @@ unit-tests:
|
||||
script:
|
||||
# Build test image
|
||||
- docker build -f Dockerfile.tests -t mod_reqin_log:tests .
|
||||
|
||||
|
||||
# Run unit tests
|
||||
- docker run --rm mod_reqin_log:tests ctest --output-on-failure
|
||||
|
||||
@ -80,18 +76,10 @@ verify-rpm-el7:
|
||||
script:
|
||||
# Download artifacts
|
||||
- apk add --no-cache curl
|
||||
- curl -L -o /tmp/rpm-el7.rpm "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/dist/rpm/mod_reqin_log-$VERSION-1.el7.x86_64.rpm"
|
||||
2>/dev/null || echo "Artifact download via curl failed, trying alternative..."
|
||||
|
||||
- curl -L -o /tmp/rpm-el7.rpm "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/dist/rpm/mod_reqin_log-$VERSION-1.el7.x86_64.rpm" 2>/dev/null || echo "Artifact download via curl failed, trying alternative..."
|
||||
|
||||
# Alternative: extract from build artifact
|
||||
- docker run --rm -v $(pwd)/dist:/packages centos:7 sh -c "
|
||||
sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo &&
|
||||
sed -i 's/#baseurl/baseurl/g' /etc/yum.repos.d/*.repo &&
|
||||
sed -i 's/metalink/#metalink/g' /etc/yum.repos.d/*.repo &&
|
||||
yum install -y /packages/rpm/*.el7.*.rpm &&
|
||||
httpd -M 2>&1 | grep reqin_log &&
|
||||
echo 'RPM el7 verification OK'
|
||||
"
|
||||
- docker run --rm -v $(pwd)/dist:/packages centos:7 sh -c "sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && sed -i 's/#baseurl/baseurl/g' /etc/yum.repos.d/*.repo && sed -i 's/metalink/#metalink/g' /etc/yum.repos.d/*.repo && yum install -y /packages/rpm/*.el7.*.rpm && httpd -M 2>&1 | grep reqin_log && echo 'RPM el7 verification OK'"
|
||||
allow_failure: true
|
||||
|
||||
verify-rpm-el8:
|
||||
@ -101,11 +89,7 @@ verify-rpm-el8:
|
||||
- docker:24-dind
|
||||
needs: [build-packages]
|
||||
script:
|
||||
- docker run --rm -v $(pwd)/dist:/packages rockylinux:8 sh -c "
|
||||
dnf install -y /packages/rpm/*.el8.*.rpm &&
|
||||
httpd -M 2>&1 | grep reqin_log &&
|
||||
echo 'RPM el8 verification OK'
|
||||
"
|
||||
- docker run --rm -v $(pwd)/dist:/packages rockylinux:8 sh -c "dnf install -y /packages/rpm/*.el8.*.rpm && httpd -M 2>&1 | grep reqin_log && echo 'RPM el8 verification OK'"
|
||||
|
||||
verify-rpm-el9:
|
||||
stage: verify
|
||||
@ -114,11 +98,7 @@ verify-rpm-el9:
|
||||
- docker:24-dind
|
||||
needs: [build-packages]
|
||||
script:
|
||||
- docker run --rm -v $(pwd)/dist:/packages rockylinux:9 sh -c "
|
||||
dnf install -y /packages/rpm/*.el9.*.rpm &&
|
||||
httpd -M 2>&1 | grep reqin_log &&
|
||||
echo 'RPM el9 verification OK'
|
||||
"
|
||||
- docker run --rm -v $(pwd)/dist:/packages rockylinux:9 sh -c "dnf install -y /packages/rpm/*.el9.*.rpm && httpd -M 2>&1 | grep reqin_log && echo 'RPM el9 verification OK'"
|
||||
|
||||
verify-deb:
|
||||
stage: verify
|
||||
@ -127,9 +107,4 @@ verify-deb:
|
||||
- docker:24-dind
|
||||
needs: [build-packages]
|
||||
script:
|
||||
- docker run --rm -v $(pwd)/dist:/packages debian:stable sh -c "
|
||||
apt-get update &&
|
||||
apt-get install -y /packages/deb/*.deb &&
|
||||
ls -la /usr/lib/apache2/modules/mod_reqin_log.so &&
|
||||
echo 'DEB verification OK'
|
||||
"
|
||||
- docker run --rm -v $(pwd)/dist:/packages debian:stable sh -c "apt-get update && apt-get install -y /packages/deb/*.deb && ls -la /usr/lib/apache2/modules/mod_reqin_log.so && echo 'DEB verification OK'"
|
||||
|
||||
Reference in New Issue
Block a user