Skip to content

Commit b7d0797

Browse files
EricWittmannEricWittmann
committed
Merge branch 'master' of github.com:Apicurio/apicurio-registry
2 parents 69bde98 + c3aa2ea commit b7d0797

File tree

5 files changed

+48
-19
lines changed

5 files changed

+48
-19
lines changed

‎.github/workflows/verify.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
env:
108108
SKIP_TESTS: "true"
109109
run: |
110-
make build-sql-native build-tenant-manager
110+
make build-sql-native build-tenant-manager-native
111111
112112
- name: Build integration-tests-common
113113
run: ./mvnw install -Pintegration-tests -pl integration-tests/integration-tests-common
@@ -151,7 +151,7 @@ jobs:
151151
IMAGE_TAG: latest-snapshot
152152
if: github.event_name == 'push'
153153
run: |
154-
make push-sql-native-image push-tenant-manager-image
154+
make push-sql-native-image push-tenant-manager-native-image
155155
156156
- name: List All The Images
157157
run: docker images

‎Makefile

+42-13
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,22 @@ build-all:
4242

4343
.PHONY: build-sql-native ## Builds sql storage variant native executable. Variables available for override [SKIP_TESTS, BUILD_FLAGS]
4444
build-sql-native:
45+
@echo "----------------------------------------------------------------------"
46+
@echo " Building SQL Storage Variant Natively "
47+
@echo "----------------------------------------------------------------------"
4548
./mvnw package -Pnative -Dquarkus.native.container-build=true -Pprod -Psql -pl storage/sql -DskipTests=$(SKIP_TESTS) $(BUILD_FLAGS)
4649

4750
.PHONY: build-kafkasql-native ## Builds kafkasql storage variant native executable. Variables available for override [SKIP_TESTS, BUILD_FLAGS]
4851
build-kafkasql-native:
52+
@echo "----------------------------------------------------------------------"
53+
@echo " Building Kafkasql Storage Variant Natively "
54+
@echo "----------------------------------------------------------------------"
4955
./mvnw package -Pnative -Dquarkus.native.container-build=true -Pprod -Pkafkasql -pl storage/kafkasql -DskipTests=$(SKIP_TESTS) $(BUILD_FLAGS)
5056

51-
.PHONY: build-tenant-manager ## Builds tenant manager natively [SKIP_TESTS, BUILD_FLAGS]
52-
build-tenant-manager:
57+
.PHONY: build-tenant-manager-native ## Builds tenant manager natively [SKIP_TESTS, BUILD_FLAGS]
58+
build-tenant-manager-native:
5359
@echo "----------------------------------------------------------------------"
54-
@echo " Building Tenant Manager "
60+
@echo " Building Tenant Manager Natively "
5561
@echo "----------------------------------------------------------------------"
5662
./mvnw package -Pnative -Dquarkus.native.container-build=true -Pprod -Pmultitenancy -pl 'multitenancy/tenant-manager-api' -DskipTests=$(SKIP_TESTS) $(BUILD_FLAGS)
5763

@@ -96,7 +102,7 @@ push-sql-image:
96102
@echo "------------------------------------------------------------------------"
97103
docker push $(IMAGE_REPO)/apicurio/apicurio-registry-sql:$(IMAGE_TAG)
98104

99-
.PHONY: build-sql-native-image ## Builds docker image for 'sql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
105+
.PHONY: build-sql-native-image ## Builds native docker image for 'sql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
100106
build-sql-native-image:
101107
@echo "------------------------------------------------------------------------"
102108
@echo " Building Image For SQL Storage Variant (using Native Executable)"
@@ -105,7 +111,7 @@ build-sql-native-image:
105111
@echo "------------------------------------------------------------------------"
106112
docker build -f $(DISTRO_DOCKER_WORKSPACE)/Dockerfile.native -t $(IMAGE_REPO)/apicurio/apicurio-registry-sql-native:$(IMAGE_TAG) storage/sql
107113

108-
.PHONY: push-sql-native-image ## Pushes docker image for 'sql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
114+
.PHONY: push-sql-native-image ## Pushes native docker image for 'sql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
109115
push-sql-native-image:
110116
@echo "------------------------------------------------------------------------"
111117
@echo " Pushing Image For SQL Storage Variant (using Native Executable)"
@@ -133,7 +139,7 @@ push-kafkasql-image:
133139
@echo "------------------------------------------------------------------------"
134140
docker push $(IMAGE_REPO)/apicurio/apicurio-registry-kafkasql:$(IMAGE_TAG)
135141

136-
.PHONY: build-kafkasql-native-image ## Builds docker image for kafkasql storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
142+
.PHONY: build-kafkasql-native-image ## Builds native docker image for kafkasql storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
137143
build-kafkasql-native-image:
138144
@echo "------------------------------------------------------------------------"
139145
@echo " Building Image For Kafkasql Storage Variant (using Native Executable)"
@@ -143,7 +149,7 @@ build-kafkasql-native-image:
143149
docker build -f $(DISTRO_DOCKER_WORKSPACE)/Dockerfile.native -t $(IMAGE_REPO)/apicurio/apicurio-registry-kafkasql-native:$(IMAGE_TAG) storage/kafkasql
144150

145151

146-
.PHONY: push-kafkasql-native-image ## Pushes docker image for 'kafkasql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
152+
.PHONY: push-kafkasql-native-image ## Pushes native docker image for 'kafkasql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
147153
push-kafkasql-native-image:
148154
@echo "------------------------------------------------------------------------"
149155
@echo " Pushing Image For Kafkasql Storage Variant (using Native Executable)"
@@ -152,14 +158,15 @@ push-kafkasql-native-image:
152158
@echo "------------------------------------------------------------------------"
153159
docker push $(IMAGE_REPO)/apicurio/apicurio-registry-kafkasql-native:$(IMAGE_TAG)
154160

155-
.PHONY: build-tenant-manager-image ## Builds native docker image for tenant manager. Variables available for override [IMAGE_REPO, IMAGE_TAG]
161+
162+
.PHONY: build-tenant-manager-image ## Builds docker image for tenant manager. Variables available for override [IMAGE_REPO, IMAGE_TAG]
156163
build-tenant-manager-image:
157164
@echo "------------------------------------------------------------------------"
158-
@echo " Building Native Image For Tenant Manager"
165+
@echo " Building Image For Tenant Manager API"
159166
@echo " Repository: $(IMAGE_REPO)"
160-
@echo " Tag: $(IMAGE_TAG)-native"
167+
@echo " Tag: $(IMAGE_TAG)"
161168
@echo "------------------------------------------------------------------------"
162-
docker build -f multitenancy/tenant-manager-api/src/main/docker/Dockerfile.native -t $(IMAGE_REPO)/apicurio/apicurio-registry-tenant-manager-api:$(IMAGE_TAG) ./multitenancy/tenant-manager-api/
169+
docker build -f multitenancy/tenant-manager-api/src/main/docker/Dockerfile.jvm -t $(IMAGE_REPO)/apicurio/apicurio-registry-tenant-manager-api:$(IMAGE_TAG) ./multitenancy/tenant-manager-api/
163170

164171

165172
.PHONY: push-tenant-manager-image ## Pushes docker image for tenant-manager-api. Variables available for override [IMAGE_REPO, IMAGE_TAG]
@@ -171,21 +178,43 @@ push-tenant-manager-image:
171178
@echo "------------------------------------------------------------------------"
172179
docker push $(IMAGE_REPO)/apicurio/apicurio-registry-tenant-manager-api:$(IMAGE_TAG)
173180

181+
.PHONY: build-tenant-manager-native-image ## Builds native docker image for tenant manager. Variables available for override [IMAGE_REPO, IMAGE_TAG]
182+
build-tenant-manager-native-image:
183+
@echo "------------------------------------------------------------------------"
184+
@echo " Building Native Image For Tenant Manager API"
185+
@echo " Repository: $(IMAGE_REPO)"
186+
@echo " Tag: $(IMAGE_TAG)"
187+
@echo "------------------------------------------------------------------------"
188+
docker build -f multitenancy/tenant-manager-api/src/main/docker/Dockerfile.native -t $(IMAGE_REPO)/apicurio/apicurio-registry-tenant-manager-api-native:$(IMAGE_TAG) ./multitenancy/tenant-manager-api/
189+
190+
191+
.PHONY: push-tenant-manager-native-image ## Pushes native docker image for tenant-manager-api. Variables available for override [IMAGE_REPO, IMAGE_TAG]
192+
push-tenant-manager-native-image:
193+
@echo "------------------------------------------------------------------------"
194+
@echo " Pushing Native Image For Tenant Manager API"
195+
@echo " Repository: $(IMAGE_REPO)"
196+
@echo " Tag: $(IMAGE_TAG)"
197+
@echo "------------------------------------------------------------------------"
198+
docker push $(IMAGE_REPO)/apicurio/apicurio-registry-tenant-manager-api-native:$(IMAGE_TAG)
199+
200+
201+
174202
.PHONY: build-all-images ## Builds all the Images. Variables available for override [IMAGE_REPO, IMAGE_TAG]
175203
build-all-images: build-mem-image build-sql-image build-kafkasql-image build-tenant-manager-image
176204

177205
.PHONY: push-all-images ## Pushes all the Images. Variables available for override [IMAGE_REPO, IMAGE_TAG]
178206
push-all-images: push-mem-image push-sql-image push-kafkasql-image push-tenant-manager-image
179207

180208

209+
181210
.PHONY: pr-check ## Builds and runs basic tests for multitenant registry pipelines
182211
pr-check:
183212
# TODO undo skipping tests for main build and running tests just for app module
184213
CURRENT_ENV=mas mvn clean install -Pno-docker -Dskip.yarn -Pprod -Psql -Pmultitenancy -am -pl app -Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
185214
CURRENT_ENV=mas mvn clean install -Pno-docker -Dskip.yarn -Pprod -Psql -Pmultitenancy -am -pl storage/sql,multitenancy/tenant-manager-api \
186215
-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false -DskipTests
187-
NO_DOCKER=true mvn verify -Pintegration-tests -Pmultitenancy -Psql -am -pl integration-tests/testsuite \
188-
-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
216+
# NO_DOCKER=true mvn verify -Pintegration-tests -Pmultitenancy -Psql -am -pl integration-tests/testsuite \
217+
# -Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
189218

190219
.PHONY: build-project ## Builds the components for multitenant registry pipelines
191220
build-project:

‎integration-tests/integration-tests-common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<groups></groups>
2121
<skipTests>true</skipTests>
2222

23-
<junit.version>5.7.2</junit.version>
23+
<junit.version>5.8.0</junit.version>
2424
<junit.platform-launcher.version>1.7.2</junit.platform-launcher.version>
2525

26-
<logback.version>1.2.5</logback.version>
26+
<logback.version>1.2.6</logback.version>
2727
<hamcrest.version>2.2</hamcrest.version>
2828
<commons-logging.version>1.2</commons-logging.version>
2929
<version.failsafe.plugin>3.0.0-M5</version.failsafe.plugin>

‎integration-tests/legacy-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groups></groups>
2020
<skipTests>true</skipTests>
2121

22-
<junit.version>5.7.2</junit.version>
22+
<junit.version>5.8.0</junit.version>
2323
<junit.platform-launcher.version>1.7.2</junit.platform-launcher.version>
2424
<version.okhttp>4.9.0</version.okhttp>
2525
<kafka.version>2.3.0</kafka.version>

‎integration-tests/testsuite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<groups></groups>
1818
<skipTests>true</skipTests>
1919

20-
<junit.version>5.7.2</junit.version>
20+
<junit.version>5.8.0</junit.version>
2121
<junit.platform-launcher.version>1.7.2</junit.platform-launcher.version>
2222

2323
<kafka.version>2.3.0</kafka.version>

0 commit comments

Comments
 (0)