Skip to content

Commit

Permalink
OPSEXP-715 Use latest openjdk-11 from distro (#6)
Browse files Browse the repository at this point in the history
* OPSEXP-715 Use latest openjdk-11 from distro
* split travis for java into java_config and maven_config
* deprecated travis for docker dockermulti
  • Loading branch information
mteodori authored Feb 19, 2021
1 parent 38cd48f commit 0685bb6
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 69 deletions.
31 changes: 2 additions & 29 deletions .travis.docker.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,2 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.0
- source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.0.0
jobs:
include:
- name: build application on openjdk8
stage: build
jdk: openjdk8
script:
- travis_wait ${TRAVIS_WAIT_TIMEOUT} mvn ${MAVEN_CLI_OPTS} clean install -Dlogging.root.level=off -Dspring.main.banner-mode=off
if: env(BUILD_JAVA8) = true
- name: build application
stage: build
script:
- travis_wait ${TRAVIS_WAIT_TIMEOUT} mvn ${MAVEN_CLI_OPTS} clean install -Dlogging.root.level=off -Dspring.main.banner-mode=off
- docker build --label "GIT_COMMIT=$TRAVIS_COMMIT" --label "GIT_BRANCH=$BRANCH" --tag "$DOCKER_IMAGE_REPOSITORY:$TRAVIS_BUILD_NUMBER" .
- |
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
then
for DOCKER_TAG in $BRANCH $BRANCH-$TRAVIS_BUILD_NUMBER
do
docker tag "$DOCKER_IMAGE_REPOSITORY:$TRAVIS_BUILD_NUMBER" "$DOCKER_REGISTRY/$DOCKER_IMAGE_REPOSITORY:$DOCKER_TAG"
docker push "$DOCKER_REGISTRY/$DOCKER_IMAGE_REPOSITORY:$DOCKER_TAG"
done
else
echo skip scan and push docker image on pull request
fi
before_install:
- source ./build.properties
# DEPRECATED
import: Alfresco/alfresco-build-tools:.travis.java_docker.yml@v1.0.2
12 changes: 2 additions & 10 deletions .travis.dockermulti.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.library.yml@v1.0.0
- source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.0.0
before_script:
- |
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
then
export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS} -Ddocker.tag=${BRANCH}"
fi
echo using MAVEN_CLI_OPTS=$MAVEN_CLI_OPTS
# DEPRECATED
import: Alfresco/alfresco-build-tools:.travis.java_docker.yml@v1.0.2
20 changes: 6 additions & 14 deletions .travis.java.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.common.yml@v1.0.0
language: java
jdk:
- openjdk11
env:
global:
- MAVEN_CLI_OPTS="$MAVEN_CLI_OPTS --batch-mode --quiet --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -U"
install: travis_wait $TRAVIS_WAIT_TIMEOUT mvn $MAVEN_CLI_OPTS dependency:resolve dependency:resolve-plugins || true
cache:
directories:
- $HOME/.m2/repository
- source: Alfresco/alfresco-build-tools:.travis.java_config.yml@v1.0.2
- source: Alfresco/alfresco-build-tools:.travis.maven_config.yml@v1.0.2
jobs:
include:
- name: build application
stage: build
script: travis_wait $TRAVIS_WAIT_TIMEOUT mvn $MAVEN_CLI_OPTS verify -Dlogging.root.level=off -Dspring.main.banner-mode=off
- name: publish artifacts
stage: publish
script: travis_wait $TRAVIS_WAIT_TIMEOUT mvn $MAVEN_CLI_OPTS source:jar javadoc:jar deploy -DskipTests
before_install:
- mkdir -p $HOME/.m2
- cp settings.xml $HOME/.m2
script: travis_wait $TRAVIS_WAIT_TIMEOUT mvn $MAVEN_CLI_OPTS deploy -DskipTests
18 changes: 18 additions & 0 deletions .travis.java_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
os: linux
dist: focal
language: java
jdk:
- openjdk11
before_install:
- |-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk11" ]]
then
echo "using latest OS provided openjdk11"
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
export PATH=$JAVA_HOME/bin:$PATH
else
echo "using Travis provided jdk"
fi
which java
java --version
10 changes: 10 additions & 0 deletions .travis.java_docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.2
- source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.0.2
before_script:
- |
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
then
export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS} -Ddocker.tag=${BRANCH}"
fi
echo using MAVEN_CLI_OPTS=$MAVEN_CLI_OPTS
2 changes: 1 addition & 1 deletion .travis.kubernetes.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.dockermulti.yml@v1.0.0
- source: Alfresco/alfresco-build-tools:.travis.dockermulti.yml@v1.0.2
- source: Alfresco/alfresco-build-tools:.travis.kubernetes_config.yml@v1.0.0
- source: Alfresco/alfresco-build-tools:.travis.kubernetes_install.yml@v1.0.0
env:
Expand Down
16 changes: 2 additions & 14 deletions .travis.library.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
import: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.0

_shared_build_application_job: &shared_job
stage: build
script: travis_wait ${TRAVIS_WAIT_TIMEOUT} mvn ${MAVEN_CLI_OPTS} clean install -Dlogging.root.level=off -Dspring.main.banner-mode=off

jobs:
include:
- name: build application on openjdk8
jdk: openjdk8
<<: *shared_job
if: env(BUILD_JAVA8) = true
- name: build application
<<: *shared_job
# DEPRECATED
import: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.2
9 changes: 9 additions & 0 deletions .travis.maven_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
cache:
directories:
- $HOME/.m2/repository
before_install:
- |-
mkdir -p $HOME/.m2
cp settings.xml $HOME/.m2
export MAVEN_CLI_OPTS="$MAVEN_CLI_OPTS -B -q -e -fae -V -DinstallAtEnd=true -DdeployAtEnd=true -U"
2 changes: 1 addition & 1 deletion .travis.rancher_cli_kubernetes_config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.rancher_cli_config.yml@master
- source: Alfresco/alfresco-build-tools:.travis.rancher_cli_config.yml@v1.0.2
before_install:
- |
mkdir -p $HOME/.kube && rancher cluster kubeconfig $CLUSTER_NAME > $HOME/.kube/config
Expand Down

0 comments on commit 0685bb6

Please sign in to comment.