Skip to content

Commit

Permalink
Merge pull request #102 from fabiobrz/add-rhsso-op-josdk
Browse files Browse the repository at this point in the history
[issue 100] - Generate the RHSSO (7.6.z) Operator provisioner Java model
  • Loading branch information
tommaso-borgato authored Oct 27, 2023
2 parents 074145f + c1dbbe4 commit f78b31e
Show file tree
Hide file tree
Showing 108 changed files with 5,783 additions and 4,884 deletions.
6 changes: 3 additions & 3 deletions .ci/openshift-ci/build-root/e2e-test-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ mvn test -Dmaven.repo.local=./local-repo-prod -pl testsuite/ -Pts.prod \
-Dintersmash.activemq.operators.package_manifest=amq-broker-rhel8 \
-Dintersmash.activemq.operators.channel=7.11.x \
-Dintersmash.activemq.operators.index_image='' \
-Dintersmash.keycloak.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:latest \
-Dintersmash.keycloak.operators.catalog_source=redhat-operators \
-Dintersmash.keycloak.operators.package_manifest=rhsso-operator \
-Dintersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:latest \
-Dintersmash.rhsso.operators.catalog_source=redhat-operators \
-Dintersmash.rhsso.operators.package_manifest=rhsso-operator \
-Dintersmash.infinispan.image=registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:latest \
-Dintersmash.infinispan.operators.catalog_source=redhat-operators \
-Dintersmash.infinispan.operators.package_manifest=datagrid \
Expand Down
46 changes: 23 additions & 23 deletions README.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions global-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activem
intersmash.activemq.operators.package_manifest=activemq-artemis-operator
intersmash.activemq.operators.channel=upstream

intersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:latest
intersmash.keycloak.realm_import.operators.catalog_source=community-operators
intersmash.keycloak.realm_import.operators.channel=fast
intersmash.keycloak.image=quay.io/keycloak/keycloak:latest
intersmash.keycloak.operators.catalog_source=community-operators
intersmash.keycloak.operators.channel=fast

intersmash.kafka.operators.channel=stable

Expand Down
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<version.junit5.jupiter.system.stubs>2.0.1</version.junit5.jupiter.system.stubs>
<version.spotless-maven-plugin>2.35.0</version.spotless-maven-plugin>
<version.dev-failsafe.failsafe>3.3.1</version.dev-failsafe.failsafe>
<version.sundrio.builder-annotations>0.101.0</version.sundrio.builder-annotations>

<!--
By default, the follwing prop is empty, stating that the build profile (community vs. productized bits)
Expand Down Expand Up @@ -369,6 +370,12 @@
<artifactId>openshift-client</artifactId>
<version>${version.openshift-client}</version>
</dependency>

<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<version>${version.sundrio.builder-annotations}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jboss.intersmash.testsuite.junit5.categories;

import org.junit.jupiter.api.Tag;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import org.junit.jupiter.api.Tag;

/**
* Mark a test that does not support community deliverables.
* Used per class.
Expand Down
Loading

0 comments on commit f78b31e

Please sign in to comment.