Maintenance: Use an i-doit service container for the i-doit integrati…

…on tests.
zammad · Apr 28, 2023 · 74c1a36 · 74c1a36
1 parent 9a9041c
commit 74c1a36
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 480 deletions.
diff --git a/.gitlab/ci/__includes__/services.yml b/.gitlab/ci/__includes__/services.yml
@@ -32,6 +32,12 @@
     MATTERMOST_PASSWORD: 'zammad'
     MATTERMOST_CHANNEL: 'zammad-channel'
 
+.variables_idoit:
+  variables:
+    IDOIT_API_CATEGORY: "Building"
+    IDOIT_API_ENDPOINT: "http://ci-service-idoit:80"
+    IDOIT_API_TOKEN: "admin"
+
 .variables_auth:
   variables:
     KEYCLOAK_BASE_URL: http://ci-service-auth:8080
@@ -87,3 +93,7 @@
   mattermost:
     name: $CI_REGISTRY/docker/zammad-mattermost:stable
     alias: ci-service-mattermost
+
+  idoit:
+    name: $CI_REGISTRY/docker/zammad-idoit:stable
+    alias: ci-service-idoit
diff --git a/.gitlab/ci/browser/capybara_integration.yml b/.gitlab/ci/browser/capybara_integration.yml
@@ -11,11 +11,13 @@ capybara:integration:chrome:
     - .template_browser-core_capybara_chrome
     - .template_browser-core_capybara_integration
     - .variables_auth
+    - .variables_idoit
   services:
     - !reference [.services, postgresql]
     - !reference [.services, selenium-chrome]
     - !reference [.services, redis]
     - !reference [.services, auth]
+    - !reference [.services, idoit]
     - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6
       alias: zammad-ci-otrsimport-db
     - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6
@@ -26,11 +28,13 @@ capybara:integration:firefox:
     - .template_browser-core_capybara_firefox
     - .template_browser-core_capybara_integration
     - .variables_auth
+    - .variables_idoit
   services:
     - !reference [.services, mysql]
     - !reference [.services, selenium-firefox]
     - !reference [.services, redis]
     - !reference [.services, auth]
+    - !reference [.services, idoit]
     - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6
       alias: zammad-ci-otrsimport-db
     - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6

diff --git a/spec/support/vcr.rb b/spec/support/vcr.rb
@@ -2,7 +2,7 @@
 
 require 'vcr'
 
-VCR_IGNORE_MATCHING_HOSTS = %w[elasticsearch selenium ci-service-mattermost zammad.org zammad.com znuny.com google.com login.microsoftonline.com github.com].freeze
+VCR_IGNORE_MATCHING_HOSTS = %w[elasticsearch selenium ci-service- zammad.org zammad.com znuny.com google.com login.microsoftonline.com github.com].freeze
 VCR_IGNORE_MATCHING_REGEXPS = [
   %r{^192\.168\.\d+\.\d+$},   # typical home network address
   %r{^172\.17\.0\.\d+$},      # docker

diff --git a/spec/system/ticket/idoit_spec.rb b/spec/system/ticket/idoit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Ticket Handling with i-doit', integration: true, required_envs: %w[IDOIT_API_TOKEN IDOIT_API_ENDPOINT IDOIT_API_CATEGORY], type: :system, use_vcr: true do
+RSpec.describe 'Ticket Handling with i-doit', integration: true, required_envs: %w[IDOIT_API_TOKEN IDOIT_API_ENDPOINT IDOIT_API_CATEGORY], type: :system do
 
   let(:api_endpoint) { ENV['IDOIT_API_ENDPOINT'] }
   let(:api_category) { ENV['IDOIT_API_CATEGORY'] }