Skip to content

Remove Java 8 support + move the testsuite from Travis to Azure #261

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

Merged
merged 7 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from 5 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
36 changes: 28 additions & 8 deletions .azure/templates/jobs/build_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ jobs:
# Strategy for the job
strategy:
matrix:
'java-8':
image: 'Ubuntu-22.04'
jdk_version: '8'
main_build: 'true'
'java-11':
image: 'Ubuntu-22.04'
jdk_version: '11'
main_build: 'false'
main_build: 'true'
'java-17':
image: 'Ubuntu-22.04'
jdk_version: '17'
Expand All @@ -25,6 +21,7 @@ jobs:
variables:
MVN_CACHE_FOLDER: $(HOME)/.m2/repository
MVN_ARGS: '-e -V -B'
MVN_EXTRA_ARGS: '--no-transfer-progress'
# Pipeline steps
steps:
# Get cached Maven repository
Expand All @@ -39,11 +36,34 @@ jobs:
BRANCH: $(Build.SourceBranch)
TESTCONTAINERS_RYUK_DISABLED: "TRUE"
TESTCONTAINERS_CHECKS_DISABLE: "TRUE"
MVN_ARGS: "-e -V -B"
- bash: "mvn ${MVN_ARGS} spotbugs:check"
displayName: "Spotbugs"
env:
MVN_ARGS: "-e -V -B"
- bash: "mvn ${MVN_ARGS} clean install -f examples/docker ${MVN_EXTRA_ARGS}"
displayName: "Test Examples"
- bash: |
cd examples/docker
./spring/test-spring.sh
displayName: "Test Spring Example"
condition: and(succeeded(), eq(variables['jdk_version'], '17'))
- bash: |
echo "127.0.0.1 keycloak" | sudo tee -a /etc/hosts
echo "127.0.0.1 hydra" | sudo tee -a /etc/hosts
echo "127.0.0.1 hydra-jwt" | sudo tee -a /etc/hosts
echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
echo "127.0.0.1 mockoauth" | sudo tee -a /etc/hosts
echo "127.0.0.1 kerberos" | sudo tee -a /etc/hosts
echo "Modified /etc/hosts:"
cat /etc/hosts
displayName: "Modify /etc/hosts"
- script: |
sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
displayName: 'Install Docker Compose'
- bash: "mvn ${MVN_ARGS} test-compile spotbugs:check -f testsuite"
displayName: "Testsuite Compile & Spotbugs"
- bash: "mvn ${MVN_ARGS} install -f testsuite ${MVN_EXTRA_ARGS}"
displayName: "Testsuite Run"
condition: succeeded()
# We have to TAR the target directory to maintain the permissions of
# the files which would otherwise change when downloading the artifact
- bash: tar -cvpf target.tar ./target
Expand Down
4 changes: 2 additions & 2 deletions .azure/templates/jobs/deploy_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ jobs:
# Strategy for the job => we deploy the artifacts only from Java 11
strategy:
matrix:
'java-8':
'java-11':
image: 'Ubuntu-22.04'
jdk_version: '8'
jdk_version: '11'
main_build: 'true'
# Set timeout for jobs
timeoutInMinutes: 60
Expand Down
12 changes: 12 additions & 0 deletions .travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ exitIfError() {
[ "$EXIT" != "0" ] && exit $EXIT
}

# # # # # # # # # # # # # # # # # # # # # # #
#
# These tests are now disabled by default.
#
#

if [ "$DISABLED" != "false" ]; then
echo "Tests are disabled by default. In order to run them locally set DISABLED=false"
echo "Usage: DISABLED=false ./build.sh"
exit 0
fi

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why aren't we just removing the .travis file? Didn't this proposal have the purpose of doing that? https://github.com/strimzi/proposals/blob/main/099-drop-travis-ci-and-testing-for-ppc-and-s390x.md

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can do that as well yes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Frawless was it your intention as per the proposal you wrote?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, .travis shoudl be removed.

arch=$(uname -m)
echo "Architecture: $arch"

Expand Down
Loading