Skip to content

Commit f752d07

Browse files
jmtdjmtd
authored
Merge branch 'ubi8' into OPENJDK-2587-tzdata-ubi8
2 parents 4effd75 + 140a10e commit f752d07

21 files changed

+151
-274
lines changed

‎.github/workflows/image-workflow-template.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: UBI8 OpenJDK S2I Image CI template
2+
on:
3+
workflow_call:
4+
inputs:
5+
image:
6+
required: true
7+
type: string
8+
env:
9+
LANG: en_US.UTF-8
10+
jobs:
11+
openjdkci:
12+
name: OpenJDK S2I Build and Test
13+
timeout-minutes: 60
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Verify latest UBI image is present
20+
run: docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
21+
22+
- name: Install CEKit
23+
uses: cekit/[email protected]
24+
25+
- name: Build
26+
run: |
27+
cekit -v --descriptor ${{ inputs.image }}.yaml build docker --no-squash
28+
29+
- name: Install and cache S2I CLI tool from GitHub
30+
uses: redhat-actions/openshift-tools-installer@v1
31+
with:
32+
source: "github"
33+
github_pat: ${{ github.token }}
34+
s2i: "1.3.4"
35+
36+
# s2i misbehaves if registry credentials are present: tries and fails to query
37+
# image metadata from docker.io before each build, etc. See:
38+
# https://github.com/openshift/source-to-image/issues/1134
39+
- name: clear docker credentials
40+
run: docker logout
41+
42+
- name: Behave Tests
43+
run: |
44+
echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
45+
cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps

‎.github/workflows/ubi8-openjdk-11-runtime.yml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,10 @@
1-
name: OpenJDK 11 Runtime Image CI
1+
name: UBI8 OpenJDK 11 Runtime Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-11-runtime
76
jobs:
8-
openjdkci:
9-
name: OpenJDK Runtime Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-11-runtime.yaml build docker
33-
docker image ls
34-
35-
# even though we don't run any S2I tests for the runtime images, the test suite
36-
# will fail to start if the s2i binary is not present.
37-
- name: install s2i binary
38-
run: |
39-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
40-
mkdir /tmp/s2i/ && cd /tmp/s2i/
41-
wget ${{ env.S2I_URI }}
42-
tar xvf source-to-image*.gz
43-
sudo mv s2i /usr/bin
44-
which s2i
45-
s2i version
46-
47-
- name: Behave Tests
48-
run: |
49-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
50-
cekit -v --descriptor ubi8-openjdk-11-runtime.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-11-runtime

‎.github/workflows/ubi8-openjdk-11.yml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
name: OpenJDK 11 S2I Image CI
1+
name: UBI8 OpenJDK 11 S2I Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-11
76
jobs:
8-
openjdkci:
9-
name: OpenJDK S2I Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-11.yaml build docker
33-
docker image ls
34-
- name: install s2i binary
35-
run: |
36-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
37-
mkdir /tmp/s2i/ && cd /tmp/s2i/
38-
wget ${{ env.S2I_URI }}
39-
tar xvf source-to-image*.gz
40-
sudo mv s2i /usr/bin
41-
which s2i
42-
s2i version
43-
- name: Behave Tests
44-
run: |
45-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
46-
cekit -v --descriptor ubi8-openjdk-11.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-11

‎.github/workflows/ubi8-openjdk-17-runtime.yml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,10 @@
1-
name: OpenJDK 17 Runtime Image CI
1+
name: UBI8 OpenJDK 17 Runtime Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-17-runtime
76
jobs:
8-
openjdkci:
9-
name: OpenJDK Runtime Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-17-runtime.yaml build docker
33-
docker image ls
34-
35-
# even though we don't run any S2I tests for the runtime images, the test suite
36-
# will fail to start if the s2i binary is not present.
37-
- name: install s2i binary
38-
run: |
39-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
40-
mkdir /tmp/s2i/ && cd /tmp/s2i/
41-
wget ${{ env.S2I_URI }}
42-
tar xvf source-to-image*.gz
43-
sudo mv s2i /usr/bin
44-
which s2i
45-
s2i version
46-
47-
- name: Behave Tests
48-
run: |
49-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
50-
cekit -v --descriptor ubi8-openjdk-17-runtime.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-17-runtime

‎.github/workflows/ubi8-openjdk-17.yml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
name: OpenJDK 17 S2I Image CI
1+
name: UBI8 OpenJDK 17 S2I Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-17
76
jobs:
8-
openjdkci:
9-
name: OpenJDK S2I Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-17.yaml build docker
33-
docker image ls
34-
- name: install s2i binary
35-
run: |
36-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
37-
mkdir /tmp/s2i/ && cd /tmp/s2i/
38-
wget ${{ env.S2I_URI }}
39-
tar xvf source-to-image*.gz
40-
sudo mv s2i /usr/bin
41-
which s2i
42-
s2i version
43-
- name: Behave Tests
44-
run: |
45-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
46-
cekit -v --descriptor ubi8-openjdk-17.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-17

‎.github/workflows/ubi8-openjdk-21-runtime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: UBI8 OpenJDK 21 Runtime S2I Image CI
1+
name: UBI8 OpenJDK 21 Runtime Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8

‎.github/workflows/ubi8-openjdk-8-runtime.yml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,10 @@
1-
name: OpenJDK 8 Runtime Image CI
1+
name: UBI8 OpenJDK 8 Runtime Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-8-runtime
76
jobs:
8-
openjdkci:
9-
name: OpenJDK Runtime Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-8-runtime.yaml build docker
33-
docker image ls
34-
35-
# even though we don't run any S2I tests for the runtime images, the test suite
36-
# will fail to start if the s2i binary is not present.
37-
- name: install s2i binary
38-
run: |
39-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
40-
mkdir /tmp/s2i/ && cd /tmp/s2i/
41-
wget ${{ env.S2I_URI }}
42-
tar xvf source-to-image*.gz
43-
sudo mv s2i /usr/bin
44-
which s2i
45-
s2i version
46-
47-
- name: Behave Tests
48-
run: |
49-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
50-
cekit -v --descriptor ubi8-openjdk-8-runtime.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-8-runtime

‎.github/workflows/ubi8-openjdk-8.yml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
name: OpenJDK 8 S2I Image CI
1+
name: UBI8 OpenJDK 8 S2I Image CI
22
on: [push, pull_request]
33
env:
44
LANG: en_US.UTF-8
5-
CEKIT_VERSION: 4.6.0
6-
S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
5+
IMAGE: ubi8-openjdk-8
76
jobs:
8-
openjdkci:
9-
name: OpenJDK S2I Build and Test
10-
runs-on: ubuntu-20.04
11-
strategy:
12-
fail-fast: false
13-
steps:
14-
- uses: actions/checkout@v2
15-
- name: Verify latest UBI image is present
16-
run: |
17-
docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
18-
docker image ls | grep ubi8
19-
- name: Setup required system packages
20-
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y virtualenv libkrb5-dev
23-
- name: Setup virtualenv and install cekit and required packages
24-
run: |
25-
mkdir ~/cekit${{ env.CEKIT_VERSION }}
26-
virtualenv -p python3 ~/cekit${{ env.CEKIT_VERSION }}
27-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
28-
pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
29-
- name: Build
30-
run: |
31-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
32-
cekit -v --descriptor ubi8-openjdk-8.yaml build docker
33-
docker image ls
34-
- name: install s2i binary
35-
run: |
36-
echo ===== Installing s2i from ${{ env.S2I_URL }} =====
37-
mkdir /tmp/s2i/ && cd /tmp/s2i/
38-
wget ${{ env.S2I_URI }}
39-
tar xvf source-to-image*.gz
40-
sudo mv s2i /usr/bin
41-
which s2i
42-
s2i version
43-
- name: Behave Tests
44-
run: |
45-
. ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
46-
cekit -v --descriptor ubi8-openjdk-8.yaml test behave
7+
call-openjdkci:
8+
uses: ./.github/workflows/image-workflow-template.yml
9+
with:
10+
image: ubi8-openjdk-8

‎modules/tar/module.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schema_version: 1
2+
name: jboss.container.tar
3+
version: '1.0'
4+
description: Installs the Tar RPM to enable `oc cp` and `oc rsync`
5+
6+
packages:
7+
install:
8+
- tar

0 commit comments

Comments
 (0)