Fixes to CI/CD now that we use osixia/openldap

This commit is contained in:
Deon George 2023-01-30 22:54:16 +11:00
parent 637a0cd0f4
commit 66409c6688
4 changed files with 52 additions and 53 deletions

View File

@ -46,5 +46,6 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
LDAP_HOST=ldap LDAP_HOST=ldap
LDAP_PORT=389 LDAP_PORT=389
LDAP_BASE_DN="dc=Test" LDAP_BASE_DN="dc=Test"
LDAP_USERNAME= LDAP_USERNAME="cn=admin,dc=Test"
LDAP_PASSWORD= LDAP_PASSWORD="test"
LDAP_CACHE=false

View File

@ -1,14 +1,14 @@
stages: stages:
- test - test
- build - build
# This folder is cached between builds # This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache # http://docs.gitlab.com/ce/ci/yaml/README.html#cache
cache: cache:
key: ${CI_COMMIT_REF_SLUG} key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
paths: paths:
- vendor/ - vendor/
include: include:
- .gitlab-test.yml - .gitlab-test.yml
- .gitlab-docker-x86_64.yml - .gitlab-docker-x86_64.yml

View File

@ -1,32 +1,27 @@
docker: docker:
image: docker:latest variables:
VERSION: latest
DOCKER_HOST: tcp://docker:2375
stage: build stage: build
image: docker:latest
services: services:
- docker:dind - docker:dind
variables:
VERSION: latest
CACHETAG: build-${VERSION}
DOCKER_HOST: tcp://docker:2375
tags:
- docker
- x86_64
only:
- BRANCH-2.0
before_script: before_script:
- docker info - docker info && docker version
- docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi
script: script:
- if [ -f init ]; then chmod 500 init; fi - if [ -f init ]; then chmod 500 init; fi
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
- echo -n ${CI_COMMIT_SHORT_SHA} > VERSION - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
- docker build -f docker/Dockerfile --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} . - rm -rf vendor/ database/schema database/seeders database/factories/*
- docker build -f docker/Dockerfile -t ${CI_REGISTRY_IMAGE}:${VERSION} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} tags:
- docker
- x86_64
only:
- BRANCH-2.0

View File

@ -1,5 +1,5 @@
test: test:
image: ${CI_REGISTRY}/leenooks/php:8.0-fpm-latest-test image: ${CI_REGISTRY}/leenooks/php:8.1-fpm-alpine-ldap-test
stage: test stage: test
@ -11,13 +11,14 @@ test:
command: ["--loglevel","debug"] command: ["--loglevel","debug"]
variables: variables:
LDAP_SEED_INTERNAL_LDIF_PATH: "${CI_PROJECT_DIR}/tests/server/openldap/ldif" LDAP_SEED_INTERNAL_LDIF_PATH: "${CI_PROJECT_DIR}/tests/server/openldap/data"
LDAP_SEED_INTERNAL_SCHEMA_PATH: "${CI_PROJECT_DIR}/tests/server/openldap/schema"
LDAP_BASE_DN: "dc=Test" LDAP_BASE_DN: "dc=Test"
LDAP_DOMAIN: "Test" LDAP_DOMAIN: "Test"
LDAP_ADMIN_PASSWORD: test LDAP_ADMIN_PASSWORD: test
# LDAP_SEED_INTERNAL_SCHEMA_PATH: "${CI_PROJECT_DIR}/tests/server/openldap/schema"
LDAP_HOST: ldap LDAP_HOST: ldap
LDAP_PORT: 389 LDAP_PORT: 389
#CI_DEBUG_SERVICES: "true"
tags: tags:
- php - php
@ -28,14 +29,16 @@ test:
- mv .env.testing .env - mv .env.testing .env
# Install Composer and project dependencies. # Install Composer and project dependencies.
- mkdir -p /root/.composer - mkdir -p ${COMPOSER_HOME}
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > /root/.composer/auth.json ; fi - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > ${COMPOSER_HOME}/auth.json; fi
- composer install - composer install
# Generate an application key. Re-cache. # Generate an application key. Re-cache.
- php artisan key:generate - php artisan key:generate
script: script:
# Sleep if we need to, in case we want to jump in and see what is going on during the test
- if [ -n "$DEBUG_PAUSE" ]; then echo "Pausing for $DEBUG_PAUSE seconds, so you can jump into the containers"; sleep $DEBUG_PAUSE; fi
# run laravel tests # run laravel tests
- XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text --colors=never - XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text --colors=never