Skip to content

Commit

Permalink
S2I-Java works as intended
Browse files Browse the repository at this point in the history
  • Loading branch information
Senjuti256 authored and otaviof committed Aug 29, 2023
1 parent 1a09ff9 commit 22b1878
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,16 @@ test-e2e-s2i-dotnet: E2E_S2I_PARAMS_REVISION = main
test-e2e-s2i-dotnet: E2E_S2I_PARAMS_ENV_VARS = DOTNET_STARTUP_PROJECT=CleanArchitecture.Api/CleanArchitecture.Api.csproj
test-e2e-s2i-dotnet: test-e2e-s2i

# runs the end-to-end tests for s2i-java
.PHONY: test-e2e-s2i-java
test-e2e-s2i-java: prepare-e2e-s2i
test-e2e-s2i-java: E2E_S2I_LANGUAGE = java
test-e2e-s2i-java: E2E_S2I_IMAGE_TAG = task-s2i-java:latest
test-e2e-s2i-java: E2E_S2I_PARAMS_URL = https://github.com/shashirajraja/shopping-cart
test-e2e-s2i-java: E2E_S2I_PARAMS_ENV_VARS = MAVEN_CLEAR_REPO=false
test-e2e-s2i-java: E2E_S2I_IMAGE_SCRIPTS_URL = image:///usr/local/s2i
test-e2e-s2i-java: test-e2e-s2i

# runs the end-to-end tests for s2i
.PHONY: test-e2e-s2i
test-e2e-s2i: prepare-e2e-s2i
Expand Down
18 changes: 18 additions & 0 deletions templates/task-s2i-java.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{- $s2iBuilderImage := .Values.s2iBuilders.java -}}
---
apiVersion: tekton.dev/v1beta1
kind: Task
metadata:
name: s2i-java
labels:
app.kubernetes.io/version: {{ .Chart.Version }}
{{- if .Values.annotations }}
annotations:
{{- .Values.annotations | toYaml | nindent 4 }}
{{- end }}
spec:
description: |
Builds the source code using the s2i's Java builder-image
{{ $s2iBuilderImage | quote }}.
{{ include "spec_s2i" ( list . $s2iBuilderImage ) | nindent 2 }}
1 change: 1 addition & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ s2iBuilders:
nodejs: registry.access.redhat.com/ubi8/nodejs-18:latest
php: registry.access.redhat.com/ubi9/php-81:1-29
dotnet: registry.access.redhat.com/ubi8/dotnet-60:6.0-37.20230802191230
java: registry.access.redhat.com/ubi8/openjdk-11:latest

annotations:
tekton.dev/pipelines.minVersion: "0.38.0"
Expand Down

0 comments on commit 22b1878

Please sign in to comment.