From 868ef2ce6a1bec98659461457de8fa3a888d5ba0 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 12:48:15 +0200
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e00a1c0..3566a0ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ cache:
before_script:
- mkdir -p $APK_CACHE_DIR
- mkdir -p $RUBY_CACHE_DIR
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
build-job:
stage: build
@@ -56,16 +56,16 @@ test-job:
APK_PACKAGES: bash build-base curl curl-dev gcompat git imagemagick imagemagick-libs imagemagick-dev libarchive-tools libpq-dev libxml2-dev libxslt-dev nodejs openjdk11-jre-headless sqlite-dev tzdata yarn
coverage: '/coverage: \d+.\d+% of statements/'
before_script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gem install rspec_junit_formatter
- bundle exec rake db:setup
script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
artifacts:
when: always
paths:
--
GitLab