Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OPENJDK-3424] Prepare initial source changes for ELS containers [rhe… #517

Merged
merged 1 commit into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/image-workflow-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: clear docker credentials
run: docker logout

- name: Behave Tests
run: |
echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
# - name: Behave Tests
# run: |
# echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
# cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: UBI8 OpenJDK 11 S2I Image CI
on: [push, pull_request]
env:
LANG: en_US.UTF-8
IMAGE: ubi8-openjdk-11
IMAGE: openjdk-11-rhel8
jobs:
call-openjdkci:
uses: ./.github/workflows/image-workflow-template.yml
with:
image: ubi8-openjdk-11
image: openjdk-11-rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: UBI8 OpenJDK 11 Runtime Image CI
on: [push, pull_request]
env:
LANG: en_US.UTF-8
IMAGE: ubi8-openjdk-11-runtime
IMAGE: openjdk-11-runtime-rhel8
jobs:
call-openjdkci:
uses: ./.github/workflows/image-workflow-template.yml
with:
image: ubi8-openjdk-11-runtime
image: openjdk-11-runtime-rhel8
6 changes: 3 additions & 3 deletions ubi8-openjdk-11.yaml → openjdk-11-rhel8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
schema_version: 1

from: "registry.access.redhat.com/ubi8/ubi-minimal"
name: &name "ubi8/openjdk-11"
name: &name "openjdk-els/openjdk-11-rhel8"
version: &version "1.20"
description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11"

Expand All @@ -17,11 +17,11 @@ labels:
- name: "maintainer"
value: "Red Hat OpenJDK <[email protected]>"
- name: "com.redhat.component"
value: "openjdk-11-ubi8-container"
value: "openjdk-els-11-rhel8-container"
- name: "usage"
value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
- name: "com.redhat.license_terms"
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements"
- name: "org.opencontainers.image.documentation"
value: *docs
- name: "name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
schema_version: 1

from: "registry.access.redhat.com/ubi8/ubi-minimal"
name: &name "ubi8/openjdk-11-runtime"
name: &name "openjdk-els/openjdk-11-runtime-rhel8"
version: &version "1.20"
description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime"

Expand All @@ -17,11 +17,11 @@ labels:
- name: "maintainer"
value: "Red Hat OpenJDK <[email protected]>"
- name: "com.redhat.component"
value: "openjdk-11-runtime-ubi8-container"
value: "openjdk-els-11-runtime-rhel8-container"
- name: "usage"
value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
- name: "com.redhat.license_terms"
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements"
- name: "org.opencontainers.image.documentation"
value: *docs
- name: "name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ osbs:
signing_intent: release
repository:
name: containers/openjdk
branch: openjdk-11-ubi8
branch: openjdk-els-11-rhel-8

packages:
manager: microdnf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ osbs:
signing_intent: release
repository:
name: containers/openjdk
branch: openjdk-11-runtime-ubi8
branch: openjdk-els-11-runtime-rhel-8

packages:
manager: microdnf
Expand Down
Loading