Skip to content

Commit

Permalink
Merge pull request #1020 from OpenLiberty/staging
Browse files Browse the repository at this point in the history 
Merge staging to prod - support java 21
  • Loading branch information
@gkwan-ibm
gkwan-ibm authored Jan 23, 2024
2 parents 2121f6a + 95877a8 commit a1b3dc5
Show file tree
Hide file tree
Showing 3 changed files with 171 additions and 1 deletion.
157 changes: 157 additions & 0 deletions .github/workflows/daily-build-java21.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
name: Daily build testing - Java 21

on:
repository_dispatch:
types: [ daily-build-java21 ]
workflow_dispatch:
inputs:
build:
description: Build level
required: true
date:
description: Dev date
required: true
driver:
description: Driver location
required: true
guide:
description: Guide to build
default: "all"
required: true
branch:
description: Branch to test
required: false

env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
CHANGE_MINIKUBE_NONE_USER: true

jobs:
get-guide-repos:
runs-on: ubuntu-latest
outputs:
repos: ${{ steps.create-list.outputs.repos }}${{ steps.input-guide.outputs.repo }}
steps:
- uses: actions/checkout@v2
- name: Get default repos
if: ${{ github.event_name == 'repository_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.guide == 'all' }}
id: create-list
run: echo "repos=[ 'guide-jpa-intro' ]" >> $GITHUB_OUTPUT
- name: Set input repo
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.guide != 'all' }}
id: input-guide
run: echo "repo=[ '${{ github.event.inputs.guide }}' ]" >> $GITHUB_OUTPUT
build-level:
runs-on: ubuntu-latest
steps:
- name: Starting daily build tests for ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
run: |
echo "Inputs: "
echo build: ${{ github.event.inputs.build }}
echo date: ${{ github.event.inputs.date }}
echo driver: ${{ github.event.inputs.driver }}
echo guide: ${{ github.event.inputs.guide }}
echo branch: ${{ github.event.inputs.branch }}
echo jdk_level: 21
echo "Build level: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}"
test-guide:
needs: [ get-guide-repos ]
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 5
matrix:
repos: ${{ fromJson(needs.get-guide-repos.outputs.repos) }}
jdk: [ "21" ]
steps:
- name: Setup JDK ${{ matrix.jdk }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.jdk }}
- name: Clone ${{ matrix.repos }}
uses: actions/checkout@v2
with:
repository: OpenLiberty/${{ matrix.repos }}
ref: ${{ github.event.inputs.branch }}
path: ${{ matrix.repos }}
- name: Set permissions
run: chmod +x ${{ matrix.repos }}/scripts/*.sh
- name: Docker login for runner
run: |
if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
then
echo podman login
echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
else
echo docker login
echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
fi
- name: Docker login for root
run: |
if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
then
echo podman login
echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
else
echo docker login
echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
fi
- name: Run tests for ${{ matrix.repos }}
working-directory: ${{ matrix.repos }}/finish
env:
BUILDLEVEL: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
DEVDATE: ${{ github.event.client_payload.dev-date }}${{ github.event.inputs.date }}
DRIVER: ${{ github.event.client_payload.driver-location }}${{ github.event.inputs.driver }}
run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -u $DOCKER_USERNAME -j ${{ matrix.jdk }}
- name: Post tests
working-directory: ${{ matrix.repos }}
if: always()
run: |
mvn -version
sudo chmod -R 777 .
logsPath=$(sudo find . -name "console.log");
if [ -z "$logsPath" ]
then
logsPath=$(sudo find . -name "messages.log");
if [ -z "$logsPath" ]
then sudo docker images
else
sudo cat $logsPath | grep product
sudo cat $logsPath | grep java.runtime
fi
else sudo cat $logsPath | grep Launching
fi
- name: Archive server logs if failed
if: failure()
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.repos }}-logs
path: |
${{ matrix.repos }}/finish/target/liberty/wlp/usr/servers/defaultServer/logs/
${{ matrix.repos }}/start/target/liberty/wlp/usr/servers/defaultServer/logs/
${{ matrix.repos }}/finish/**/target/liberty/wlp/usr/servers/defaultServer/logs/
${{ matrix.repos }}/start/**/target/liberty/wlp/usr/servers/defaultServer/logs/
if-no-files-found: ignore
- name: Archive npm logs if failed
if: failure()
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.repos }}-npm-logs
path: ~/.npm/_logs
if-no-files-found: ignore
slack-alert:
needs: [test-guide]
if: failure()
runs-on: ubuntu-latest
env:
BUILDLEVEL: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
DEVDATE: ${{ github.event.client_payload.dev-date }}${{ github.event.inputs.date }}
DRIVER: ${{ github.event.client_payload.driver-location }}${{ github.event.inputs.driver }}
steps:
- uses: actions/checkout@v2
- name: send-status
run: |
python3 .github/workflows/slack-alert.py ${{ env.BUILDLEVEL }} ${{ env.DRIVER }} ${{ env.DEVDATE }} ${{ needs.test-guide.result }} \
${{ github.repository }} ${{ github.run_id }} ${{ secrets.SLACK_HOOK }}
echo ${{ needs.test-guide.result }}
7 changes: 7 additions & 0 deletions .github/workflows/pre-daily-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
CONTENT_TYPE: "application/json"
PAYLOAD: '{ "dev-date": "${{ matrix.builds.date }}", "driver-location": "${{ matrix.builds.driver_location }}", "build-level": "${{ matrix.builds.build_level }}", "jdk": "11" }'
PAYLOAD_JAVA17: '{ "dev-date": "${{ matrix.builds.date }}", "driver-location": "${{ matrix.builds.driver_location }}", "build-level": "${{ matrix.builds.build_level }}", "jdk": "17" }'
PAYLOAD_JAVA21: '{ "dev-date": "${{ matrix.builds.date }}", "driver-location": "${{ matrix.builds.driver_location }}", "build-level": "${{ matrix.builds.build_level }}", "jdk": "21" }'
steps:
- name: Trigger daily builds for Java 11
run: |
Expand All @@ -98,3 +99,9 @@ jobs:
-H "Authorization: token $GH_TOKEN" \
-d "{ \"event_type\": \"daily-build-java17\", \"client_payload\": $PAYLOAD_JAVA17 }" \
-X POST $URI
- name: Trigger daily builds for Java 21
run: |
curl -H "Accept: $ACCEPT_HEADER" \
-H "Authorization: token $GH_TOKEN" \
-d "{ \"event_type\": \"daily-build-java21\", \"client_payload\": $PAYLOAD_JAVA21 }" \
-X POST $URI
8 changes: 7 additions & 1 deletion guide_prereqs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
{
"name": "Java SDK",
"link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
"guides": ["*"]
"guides": ["*"],
"exclude": ["jpa-intro"]
},
{
"name": "Java SDK 21",
"link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
"guides": ["jpa-intro"]
},
{
"name": "Git",
Expand Down

0 comments on commit a1b3dc5

Please sign in to comment.