summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-07-09 09:38:17 +0000
committerCan Eldem <celdem@gitlab.com>2020-07-09 09:38:17 +0000
commit6f05f7b73defa1e51643a5ab4935d2b4120e3ef4 (patch)
tree918ac0735a9e209f3e110d463752a63840e297d0
parent6e5916dfa78cb7277de3237164b33a80138e582c (diff)
parent725a3740e245bd594638e2ce03d8c0ac5f994aad (diff)
Merge branch 'enable-java-gradle-functional-tests' into 'master'
Add java-gradle functional tests See merge request gitlab-org/security-products/license-management!187
-rw-r--r--.gitlab/test.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 98bd92f..8d664c0 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -119,6 +119,8 @@ integration-ruby:
SECURE_ANALYZERS_PREFIX: $CI_REGISTRY_IMAGE
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ when: always
+ allow_failure: false
functional-c-conan:
extends: .functional
@@ -132,6 +134,10 @@ functional-go-modules:
extends: .functional
trigger: gitlab-org/security-products/tests/go-modules
+functional-java-gradle:
+ extends: .functional
+ trigger: gitlab-org/security-products/tests/java-gradle
+
functional-java-maven-multimodules:
extends: .functional
trigger: gitlab-org/security-products/tests/java-maven-multimodules