ATS-851: Improve build reliability (#329)

- Add Maven Central to top of repo search list
- Disable Maven connection pool
- Fixed formatting
This commit is contained in:
Nebil Kisa 2021-02-02 13:36:06 +00:00 committed by GitHub
parent c5d7791cb5
commit 97b9fc39cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions

View File

@ -36,8 +36,8 @@ jobs:
name: "Core & Base Snapshot deployment" # This is to separate the snapshot deployment from the following jobs, to prevent duplication on nexus name: "Core & Base Snapshot deployment" # This is to separate the snapshot deployment from the following jobs, to prevent duplication on nexus
if: branch = master AND type != pull_request if: branch = master AND type != pull_request
before_script: travis_wait bash _ci/cache_artifacts.sh before_script: travis_wait bash _ci/cache_artifacts.sh
install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Pbase install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Pbase script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
- name: "ImageMagick" - name: "ImageMagick"
if: branch NOT IN (company_release) if: branch NOT IN (company_release)
before_script: travis_wait bash _ci/cache_artifacts.sh before_script: travis_wait bash _ci/cache_artifacts.sh

View File

@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
set -vex set -vex
pushd "$(dirname "${BASH_SOURCE[0]}")/../" pushd "$(dirname "${BASH_SOURCE[0]}")/../"
mvn -B -U \ mvn -B -U -Dmaven.wagon.http.pool=false \
clean install \ clean install \
-DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \ -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
-DskipTests \ -DskipTests \
@ -14,4 +14,3 @@ mvn -B -U \
popd popd
set +vex set +vex
echo "=========================== Finishing Build Script ==========================" echo "=========================== Finishing Build Script =========================="

View File

@ -14,7 +14,7 @@ git checkout -B "${TRAVIS_BRANCH}"
git config user.email "build@alfresco.com" git config user.email "build@alfresco.com"
# Run the release plugin - with "[skip ci]" in the release commit message # Run the release plugin - with "[skip ci]" in the release commit message
mvn -B \ mvn -B -Dmaven.wagon.http.pool=false \
${DRY_RUN} \ ${DRY_RUN} \
-Prelease \ -Prelease \
"-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \ "-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \

View File

@ -6,6 +6,15 @@
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<repositories> <repositories>
<repository>
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository> <repository>
<id>alfresco-internal</id> <id>alfresco-internal</id>
<name>Alfresco Internal Repository</name> <name>Alfresco Internal Repository</name>
@ -69,7 +78,7 @@
<username>bamboo</username> <username>bamboo</username>
<password>${env.NEXUS_PASSWORD}</password> <password>${env.NEXUS_PASSWORD}</password>
</server> </server>
<!-- private docker registry--> <!-- private docker registry-->
<server> <server>
<id>quay.io</id> <id>quay.io</id>

View File

@ -12,15 +12,14 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../"
[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify" [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify"
# Do not deploy snapshots for alfresco-transform-core and alfresco-transformer-base # Do not deploy snapshots for alfresco-transform-core and alfresco-transformer-base
mvn -B -U \ mvn -B -U -Dmaven.wagon.http.pool=false \
clean ${DEPLOY} \ clean ${DEPLOY} \
-DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \ -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
-Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true \ -Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true \
"-P${PROFILE},docker-it-setup,${1}" "-P${PROFILE},docker-it-setup,${1}"
docker ps -a -q | xargs -r -l docker stop ; docker ps -a -q | xargs -r -l docker rm docker ps -a -q | xargs -r -l docker stop ; docker ps -a -q | xargs -r -l docker rm
popd popd
set +vex set +vex
echo "=========================== Finishing Test&Deploy Script ==========================" echo "=========================== Finishing Test&Deploy Script =========================="