Skip to content

Commit

Permalink
Merge pull request #80 from mareknovotny/ci-quarkus3-removal
Browse files Browse the repository at this point in the history
Disabled LTS quarkus jobs/env
  • Loading branch information
mareknovotny authored Feb 2, 2024
2 parents 3d50f3e + 4d3fb47 commit cda1665
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 84 deletions.
25 changes: 0 additions & 25 deletions .ci/environments/quarkus-lts/before.sh

This file was deleted.

40 changes: 18 additions & 22 deletions .ci/jenkins/config/branch.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
generation_config:
missing_environments: ignore

job_types:
setup_branch:
disabled: true
nightly:
disabled: false
other:
disabled: true
pullrequest:
disabled: false
release:
disabled: true
tools:
disabled: true

environments:
native:
env_vars:
Expand All @@ -17,27 +34,6 @@ environments:
QUARKUS_BRANCH: '2.16'
ids:
- quarkus
quarkus-lts:
pull_request_default_check: false
env_vars:
BUILD_MVN_OPTS: -Dproductized
QUARKUS_BRANCH: '2.13'
ids:
- quarkus
- lts
- prod
native-lts:
env_vars:
NATIVE: true
BUILD_MVN_OPTS: -Dproductized
BUILD_MVN_OPTS_CURRENT: -Dnative -Dquarkus.native.container-build=true
QUARKUS_BRANCH: '2.13'
QUARKUS_NATIVE_BUILDER_IMAGE: mandrel
ADDITIONAL_TIMEOUT: 720
ids:
- native
- prod
- lts
ecosystem:
auto_generation: false
ids:
Expand Down Expand Up @@ -100,5 +96,5 @@ jenkins:
email_creds_id: OPTAPLANNER_CI_EMAIL
default_tools:
jdk: kie-jdk17
maven: kie-maven-3.8.7
maven: kie-maven-3.9.3
sonar_jdk: kie-jdk17
8 changes: 4 additions & 4 deletions .ci/jenkins/dsl/jobs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,12 @@ setupDeployJob(JobType.NIGHTLY)
setupSpecificBuildChainNightlyJob('native')
setupSpecificBuildChainNightlyJob('quarkus-main')
setupSpecificBuildChainNightlyJob('quarkus-branch')
setupSpecificBuildChainNightlyJob('quarkus-lts')
setupSpecificBuildChainNightlyJob('native-lts')
//setupSpecificBuildChainNightlyJob('quarkus-lts')
//setupSpecificBuildChainNightlyJob('native-lts')

// Release jobs
setupDeployJob(JobType.RELEASE)
setupPromoteJob(JobType.RELEASE)
//setupDeployJob(JobType.RELEASE)
//setupPromoteJob(JobType.RELEASE)

if (Utils.isMainBranch(this)) {
setupOptaPlannerTurtleTestsJob('drools')
Expand Down
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: '03:00'
open-pull-requests-limit: 0
target-branch: "main"
commit-message:
prefix: "[bot]"
- package-ecosystem: maven
directory: "/"
schedule:
Expand Down
16 changes: 0 additions & 16 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ How to retest this PR or trigger a specific build:
Run checks against Quarkus main branch
Please add comment: <b>Jenkins (re)run [optaplanner|optaplanner-quickstarts] quarkus-branch</b>

- for <b>quarkus lts checks</b>
Run checks against Quarkus lts branch
Please add comment: <b>Jenkins run quarkus-lts</b>

- for a <b>specific quarkus lts check</b>
Run checks against Quarkus lts branch
Please add comment: <b>Jenkins (re)run [optaplanner|optaplanner-quickstarts] quarkus-lts</b>

- for <b>native checks</b>
Run native checks
Please add comment: <b>Jenkins run native</b>
Expand All @@ -94,14 +86,6 @@ How to retest this PR or trigger a specific build:
Run native checks
Please add comment: <b>Jenkins (re)run [optaplanner|optaplanner-quickstarts] native</b>

- for <b>native lts checks</b>
Run native checks against quarkus lts branch
Please add comment: <b>Jenkins run native-lts</b>

- for a <b>specific native lts check</b>
Run native checks against quarkus lts branch
Please add comment: <b>Jenkins (re)run [optaplanner|optaplanner-quickstarts] native-lts</b>

</details>

### CI Status
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/full-downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
java-version: [ 11 ]
maven-version: [ '3.8.7' ]
java-version: [ 17 ]
maven-version: [ '3.9.3' ]
fail-fast: false
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/optaplanner-9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
os: [ ubuntu-latest ]
java-version: [ 17 ]
maven-version: [ '3.8.7' ]
maven-version: [ '3.9.3' ]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand All @@ -42,7 +42,5 @@ jobs:
maven-version: ${{ matrix.maven-version }}
cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }}

- name: Migrate to 9
run: ./build/8-to-9-migration/migrate.sh --no-version-upgrade --no-commit
- name: Build with Maven
run: mvn -B --fail-at-end clean install -Dfull -Dformatter.skip
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
java-version: [ 11, 17, 20 ]
maven-version: [ '3.8.7' ]
maven-version: [ '3.9.3' ]
fail-fast: false
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/quarkus-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
java-version: [ 11 ]
maven-version: [ '3.8.7' ]
java-version: [ 17 ]
maven-version: [ '3.9.3' ]
fail-fast: false
runs-on: ${{ matrix.os }}
if: github.actor == 'quarkusbot'
Expand Down

0 comments on commit cda1665

Please sign in to comment.