From 41c38e8e18ea7c01f5e29b086847b668fd701acb Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 2 Oct 2020 13:48:37 +0300 Subject: [PATCH 001/153] APPS-241 - create Community Release for v2.7 --- .travis.yml | 29 ++++++++++++++++++++++++++--- scripts/release-community.sh | 25 +++++++++++++++++++++++++ scripts/zip-artifacts.sh | 12 ++++++++++++ 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 scripts/release-community.sh create mode 100644 scripts/zip-artifacts.sh diff --git a/.travis.yml b/.travis.yml index 59d981a1c6..006a9da762 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,10 @@ install: skip services: - docker +env: + global: + - RELEASE_VERSION=2.7.3 + - DEVELOPMENT_VERSION=2.7.3-SNAPSHOT stages: - name: Build AGS @@ -110,9 +114,28 @@ jobs: - echo "Static Analysis (SAST)" - name: "Community Release" - stage: Release - script: - - echo "Community Release" + stage: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[community release\]/ + script: + - echo "Community Release" + - bash scripts/release-community.sh + before_deploy: + - bash scripts/zip-artifacts.sh community + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + - name: "Enterprise Release" stage: Release script: diff --git a/scripts/release-community.sh b/scripts/release-community.sh new file mode 100644 index 0000000000..6a5f0ed88e --- /dev/null +++ b/scripts/release-community.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e + +GIT_COMMITTER_NAME=alfresco-build +GIT_COMMITTER_EMAIL=info@alfresco.com + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" +# Add email to link commits to user +git config user.email "${GIT_COMMITTER_EMAIL}" +git config user.name "${GIT_COMMITTER_NAME}" + + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; + then echo "Please provide a Release and Development verison" + exit -1 +else + mvn --batch-mode + -Dusername="${GITHUB_USERNAME}" \ + -Dpassword="${GITHUB_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DskipTests -Dcommunity -DuseReleaseProfile=false \ + -Prelease-community release:clean release:prepare release:perform +fi diff --git a/scripts/zip-artifacts.sh b/scripts/zip-artifacts.sh new file mode 100644 index 0000000000..506262140b --- /dev/null +++ b/scripts/zip-artifacts.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e + +if [ $1 == 'community' ]; then + mkdir "artifacts_dir" + cp rm-community/rm-community-repo/target/alfresco-rm-*community*amp artifacts_dir + cp rm-community/rm-community-share/target/alfresco-rm-*community*amp artifacts_dir + zip alfresco-rm-community-${RELEASE_VERSION}.zip *amp + cp alfresco-rm-community-${RELEASE_VERSION}.zip artifacts_dir + ls artifacts_dir +#elif [ $1 == "enterprise" ]; then +fi From c18dda6c06fc35e86c06fe0aa6d455dcafc9f825 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 6 Oct 2020 14:20:17 +0300 Subject: [PATCH 002/153] APPS-241 - Add script for extracting the Release Version, Development Version, Release Type and the right S3 locations for the artefacts --- .travis.yml | 11 +++++++---- scripts/set-release-variables.sh | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100755 scripts/set-release-variables.sh diff --git a/.travis.yml b/.travis.yml index 006a9da762..bc7642ef01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,7 +115,9 @@ jobs: - name: "Community Release" stage: Release - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[community release\]/ + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/ + before_script: + bash scripts/set-release-variables.sh script: - echo "Community Release" - bash scripts/release-community.sh @@ -126,15 +128,16 @@ jobs: access_key_id: ${ARTIFACTS_KEY} secret_access_key: ${ARTIFACTS_SECRET} region: "eu-west-1" - bucket: "alfresco-artefacts-staging" - upload_dir: "community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + bucket: ${ARTIFACTS_UPLOAD_BUCKET} + upload_dir: ${ARTIFACTS_UPLOAD_DIR} skip_cleanup: true acl: private local_dir: artifacts_dir on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + - name: "Enterprise Release" stage: Release diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..5cfb357fba --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,34 @@ +#!/bin/bash +set -e + +# TODO: check if the message is in the right format eg [internal community release 3.4.0 3.4.0-SNAPSHOT] + + +export RELEASE_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\d\.)+\d ') +export DEVELOPMENT_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\d\.)+\d-SNAPSHOT') + +export release_type=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po 'internal (community|enterprise)') + +if [[ $release_type =~ "community" ]]; then + echo "Setting Community release variables..." + if [[ $release_type =~ "internal" ]]; then + echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" + export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" + export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + else + echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" +# export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" -> +# export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + fi +elif [[ $release_type =~ "enterprise" ]]; then + echo "Setting Enterprise release variables..." + if [[ $release_type =~ "internal" ]]; then + echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" + export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" + export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}" + else + echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" +# export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" -> +# export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}" + fi +fi \ No newline at end of file From d42e5854a375969459f16a60f344e8ff788bc564 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 7 Oct 2020 16:02:26 +0300 Subject: [PATCH 003/153] APPS-241: - address PR comments - extract release version and development version from commit message --- .travis.yml | 4 ---- README.md | 9 +++++++++ scripts/release-community.sh | 6 +----- scripts/set-release-variables.sh | 30 ++++++++++++++++++------------ scripts/zip-artifacts.sh | 4 ++-- travis-env-vars.yml | 2 ++ 6 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc7642ef01..a8567cb0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,6 @@ install: skip services: - docker -env: - global: - - RELEASE_VERSION=2.7.3 - - DEVELOPMENT_VERSION=2.7.3-SNAPSHOT stages: - name: Build AGS diff --git a/README.md b/README.md index 2fc454a51f..adf944d8bc 100644 --- a/README.md +++ b/README.md @@ -138,3 +138,12 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using solr start -a "-Dcreate.alfresco.defaults=alfresco,archive" ``` Start your repository + +## Release process + +In order to release a new community or enterprise version you need to: +* make sure you are either on a release branch or on master branch +* push a new commit message containing the following [$release_type release $release_version $development_version] where + * release_type should contain one of the following: *internal community*/*internal enterprise* -> for internal releases or _community_/_enterprise_ + * release_version must contain the desired release version + * development_version must contain the next development version \ No newline at end of file diff --git a/scripts/release-community.sh b/scripts/release-community.sh index 6a5f0ed88e..3627c63cf8 100644 --- a/scripts/release-community.sh +++ b/scripts/release-community.sh @@ -1,16 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -GIT_COMMITTER_NAME=alfresco-build -GIT_COMMITTER_EMAIL=info@alfresco.com - # Use full history for release git checkout -B "${TRAVIS_BRANCH}" # Add email to link commits to user git config user.email "${GIT_COMMITTER_EMAIL}" git config user.name "${GIT_COMMITTER_NAME}" - if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" exit -1 diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 5cfb357fba..a21b74de9d 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,34 +1,40 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash -# TODO: check if the message is in the right format eg [internal community release 3.4.0 3.4.0-SNAPSHOT] +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | ggrep -Po '\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])\s(\d\.)+\d-SNAPSHOT\]') +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 0 +fi -export RELEASE_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\d\.)+\d ') -export DEVELOPMENT_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\d\.)+\d-SNAPSHOT') +export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])') +export DEVELOPMENT_VERSION=$(echo $release_message | ggrep -Po '(\d\.)+\d-SNAPSHOT') -export release_type=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po 'internal (community|enterprise)') +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" + +release_type=$(echo $release_message | ggrep -Po '(internal\s)*(community|enterprise)') if [[ $release_type =~ "community" ]]; then - echo "Setting Community release variables..." + echo "Setting Community Release variables..." if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}" else echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" -# export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" -> -# export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" + export ARTIFACTS_UPLOAD_DIR="release/community/RM/${RELEASE_VERSION}" fi elif [[ $release_type =~ "enterprise" ]]; then - echo "Setting Enterprise release variables..." + echo "Setting Enterprise Release variables..." if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}" else echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" -# export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" -> -# export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}" + export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" + export ARTIFACTS_UPLOAD_DIR="release/enterprise/RM/${RELEASE_VERSION}" fi fi \ No newline at end of file diff --git a/scripts/zip-artifacts.sh b/scripts/zip-artifacts.sh index 506262140b..50154690a6 100644 --- a/scripts/zip-artifacts.sh +++ b/scripts/zip-artifacts.sh @@ -1,12 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if [ $1 == 'community' ]; then mkdir "artifacts_dir" cp rm-community/rm-community-repo/target/alfresco-rm-*community*amp artifacts_dir cp rm-community/rm-community-share/target/alfresco-rm-*community*amp artifacts_dir + cd artifacts_dir zip alfresco-rm-community-${RELEASE_VERSION}.zip *amp - cp alfresco-rm-community-${RELEASE_VERSION}.zip artifacts_dir ls artifacts_dir #elif [ $1 == "enterprise" ]; then fi diff --git a/travis-env-vars.yml b/travis-env-vars.yml index cb6c4b75d6..fdb8385892 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,3 +4,5 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - GIT_COMMITTER_NAME=alfresco-build + - GIT_COMMITTER_EMAIL=info@alfresco.com \ No newline at end of file From 24d140b26aaab08e54b6a7982583b17cbd1577a6 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 8 Oct 2020 14:24:45 +0300 Subject: [PATCH 004/153] APPS-241: - address PR comments --- .travis.yml | 2 +- scripts/set-release-variables.sh | 6 +++--- travis-env-vars.yml | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8567cb0e5..8e808377b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,7 +111,7 @@ jobs: - name: "Community Release" stage: Release - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/ + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*community release.*\]$ before_script: bash scripts/set-release-variables.sh script: diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index a21b74de9d..b61e123e56 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -7,7 +7,7 @@ if [ ! -n "$release_message" ]; then exit 0 fi -export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])') +export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}') export DEVELOPMENT_VERSION=$(echo $release_message | ggrep -Po '(\d\.)+\d-SNAPSHOT') echo "Release version is set to $RELEASE_VERSION" @@ -20,7 +20,7 @@ if [[ $release_type =~ "community" ]]; then if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" - export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}" + export ARTIFACTS_UPLOAD_DIR="community/RM/${RELEASE_VERSION}" else echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" @@ -31,7 +31,7 @@ elif [[ $release_type =~ "enterprise" ]]; then if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" - export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}" + export ARTIFACTS_UPLOAD_DIR="enterprise/RM/${RELEASE_VERSION}" else echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" diff --git a/travis-env-vars.yml b/travis-env-vars.yml index fdb8385892..3f2b6d8705 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,6 +3,4 @@ env: - AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin - - GIT_COMMITTER_NAME=alfresco-build - - GIT_COMMITTER_EMAIL=info@alfresco.com \ No newline at end of file + - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin \ No newline at end of file From 4a3cf6980540bd3f313d0cc7787ff2e85e670d46 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 8 Oct 2020 15:10:48 +0300 Subject: [PATCH 005/153] APPS-241: - address PR comments related to release documentation --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index adf944d8bc..bb6b633be3 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,16 @@ Start your repository ## Release process In order to release a new community or enterprise version you need to: -* make sure you are either on a release branch or on master branch -* push a new commit message containing the following [$release_type release $release_version $development_version] where +* make sure you use either a release branch or the master branch +* the branch involved in the release should not be forked and should not have an open PR +* push a new commit message containing the following pattern [$release_type release $release_version $development_version] where * release_type should contain one of the following: *internal community*/*internal enterprise* -> for internal releases or _community_/_enterprise_ * release_version must contain the desired release version - * development_version must contain the next development version \ No newline at end of file + * development_version must contain the next development version + +Release commit message examples: + * internal enterprise version: + _[internal enterprise release 3.4.a-A1 3.5.0-SNAPSHOT]_ + * community version: + _[community release 3.4.a 3.5.0-SNAPSHOT]_ + \ No newline at end of file From 7277b2adf03a98db2d515fb64ce1aed5c05cd5c0 Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 9 Oct 2020 09:54:23 +0300 Subject: [PATCH 006/153] APPS-241: - remove release documentation - update regex to get only the first match of the release version - update release script to be used in enterprise release as well --- .travis.yml | 2 +- README.md | 16 ---------------- scripts/{release-community.sh => release.sh} | 16 +++++++++++++--- scripts/set-release-variables.sh | 10 +++++----- scripts/zip-artifacts.sh | 1 + 5 files changed, 20 insertions(+), 25 deletions(-) rename scripts/{release-community.sh => release.sh} (57%) mode change 100644 => 100755 mode change 100644 => 100755 scripts/zip-artifacts.sh diff --git a/.travis.yml b/.travis.yml index 8e808377b4..3ce9ea282d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,7 +116,7 @@ jobs: bash scripts/set-release-variables.sh script: - echo "Community Release" - - bash scripts/release-community.sh + - bash scripts/release.sh community before_deploy: - bash scripts/zip-artifacts.sh community deploy: diff --git a/README.md b/README.md index bb6b633be3..9e6bd7d8ce 100644 --- a/README.md +++ b/README.md @@ -138,20 +138,4 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using solr start -a "-Dcreate.alfresco.defaults=alfresco,archive" ``` Start your repository - -## Release process - -In order to release a new community or enterprise version you need to: -* make sure you use either a release branch or the master branch -* the branch involved in the release should not be forked and should not have an open PR -* push a new commit message containing the following pattern [$release_type release $release_version $development_version] where - * release_type should contain one of the following: *internal community*/*internal enterprise* -> for internal releases or _community_/_enterprise_ - * release_version must contain the desired release version - * development_version must contain the next development version - -Release commit message examples: - * internal enterprise version: - _[internal enterprise release 3.4.a-A1 3.5.0-SNAPSHOT]_ - * community version: - _[community release 3.4.a 3.5.0-SNAPSHOT]_ \ No newline at end of file diff --git a/scripts/release-community.sh b/scripts/release.sh old mode 100644 new mode 100755 similarity index 57% rename from scripts/release-community.sh rename to scripts/release.sh index 3627c63cf8..77ede07469 --- a/scripts/release-community.sh +++ b/scripts/release.sh @@ -7,15 +7,25 @@ git checkout -B "${TRAVIS_BRANCH}" git config user.email "${GIT_COMMITTER_EMAIL}" git config user.name "${GIT_COMMITTER_NAME}" +release_type=$1 + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" - exit -1 + exit 1 else mvn --batch-mode -Dusername="${GITHUB_USERNAME}" \ -Dpassword="${GITHUB_PASSWORD}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ - -DskipTests -Dcommunity -DuseReleaseProfile=false \ - -Prelease-community release:clean release:prepare release:perform + -DskipTests -D${release_type} -DuseReleaseProfile=false \ + -Prelease-${release_type} release:clean release:prepare release:perform fi diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index b61e123e56..c7da4594e1 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash -release_message=$(echo $TRAVIS_COMMIT_MESSAGE | ggrep -Po '\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])\s(\d\.)+\d-SNAPSHOT\]') +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\]') if [ ! -n "$release_message" ]; then echo "The commit message is in the wrong format or it does not contain all the required properties." - exit 0 + exit 1 fi -export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}') -export DEVELOPMENT_VERSION=$(echo $release_message | ggrep -Po '(\d\.)+\d-SNAPSHOT') +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" -release_type=$(echo $release_message | ggrep -Po '(internal\s)*(community|enterprise)') +release_type=$(echo $release_message | grep -Po '(internal\s)*(community|enterprise)') if [[ $release_type =~ "community" ]]; then echo "Setting Community Release variables..." diff --git a/scripts/zip-artifacts.sh b/scripts/zip-artifacts.sh old mode 100644 new mode 100755 index 50154690a6..c182809d4e --- a/scripts/zip-artifacts.sh +++ b/scripts/zip-artifacts.sh @@ -5,6 +5,7 @@ if [ $1 == 'community' ]; then mkdir "artifacts_dir" cp rm-community/rm-community-repo/target/alfresco-rm-*community*amp artifacts_dir cp rm-community/rm-community-share/target/alfresco-rm-*community*amp artifacts_dir + cp rm-community/rm-community-rest-api-explorer/target/alfresco-rm-*community*war artifacts_dir cd artifacts_dir zip alfresco-rm-community-${RELEASE_VERSION}.zip *amp ls artifacts_dir From f8aff5caf387f771e281adfc87ca86bfe88c509d Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 9 Oct 2020 14:36:54 +0300 Subject: [PATCH 007/153] APPS-241: - remove publish stage as it is part of release stage - rename release stage to release and publish --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ce9ea282d..0ac66c20bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,7 @@ stages: - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans - - name: Release - - name: Publish + - name: Release and Publish jobs: include: @@ -110,7 +109,7 @@ jobs: - echo "Static Analysis (SAST)" - name: "Community Release" - stage: Release + stage: Release and Publish if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*community release.*\]$ before_script: bash scripts/set-release-variables.sh @@ -136,11 +135,6 @@ jobs: - name: "Enterprise Release" - stage: Release + stage: Release and Publish script: - echo "Enterprise Release" - - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" From f46976a6875242d9e7016a9c4a2e3be46dfd53cb Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Fri, 9 Oct 2020 16:33:09 +0300 Subject: [PATCH 008/153] APPS-241: Set up pre-commit plugin and enterprise release step - Added enterprise release stage and used existing configuration as the one for community release --- .travis.yml | 25 +++++++++++++++++++++++-- scripts/zip-artifacts.sh | 8 +++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ac66c20bf..89a181cb62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,5 +136,26 @@ jobs: - name: "Enterprise Release" stage: Release and Publish - script: - - echo "Enterprise Release" + stage: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/ + before_script: + bash scripts/set-release-variables.sh + script: + - echo "Enterprise Release" + - bash scripts/release.sh enterprise + before_deploy: + - bash scripts/zip-artifacts.sh enterprise + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: ${ARTIFACTS_UPLOAD_BUCKET} + upload_dir: ${ARTIFACTS_UPLOAD_DIR} + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" diff --git a/scripts/zip-artifacts.sh b/scripts/zip-artifacts.sh index c182809d4e..d81acca46d 100755 --- a/scripts/zip-artifacts.sh +++ b/scripts/zip-artifacts.sh @@ -9,5 +9,11 @@ if [ $1 == 'community' ]; then cd artifacts_dir zip alfresco-rm-community-${RELEASE_VERSION}.zip *amp ls artifacts_dir -#elif [ $1 == "enterprise" ]; then +elif [ $1 == "enterprise" ]; then + mkdir "artifacts_dir" + cp rm-enterprise/rm-enterprise-repo/target/alfresco-rm-*enterprise*amp artifacts_dir + cp rm-enterprise/rm-enterprise-share/target/alfresco-rm-*enterprise*amp artifacts_dir + cd artifacts_dir + zip alfresco-rm-enterprise-${RELEASE_VERSION}.zip *amp + ls artifacts_dir fi From da43ea90bb752f72c347d232cbef22724902b4d1 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 10:58:34 +0300 Subject: [PATCH 009/153] APPS-241: - combine community and enterprise publish stages into one --- .travis.yml | 38 +++++--------------------------- scripts/set-release-variables.sh | 2 ++ 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89a181cb62..c7198c571c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,16 +108,15 @@ jobs: script: - echo "Static Analysis (SAST)" - - name: "Community Release" + - name: "Release" stage: Release and Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*community release.*\]$ + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ before_script: bash scripts/set-release-variables.sh script: - - echo "Community Release" - - bash scripts/release.sh community + - bash scripts/release.sh ${RELEASE_TYPE} before_deploy: - - bash scripts/zip-artifacts.sh community + - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} deploy: - provider: s3 access_key_id: ${ARTIFACTS_KEY} @@ -131,31 +130,4 @@ jobs: on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" - - - - name: "Enterprise Release" - stage: Release and Publish - stage: Release - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/ - before_script: - bash scripts/set-release-variables.sh - script: - - echo "Enterprise Release" - - bash scripts/release.sh enterprise - before_deploy: - - bash scripts/zip-artifacts.sh enterprise - deploy: - - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} - region: "eu-west-1" - bucket: ${ARTIFACTS_UPLOAD_BUCKET} - upload_dir: ${ARTIFACTS_UPLOAD_DIR} - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index c7da4594e1..56dfbb680e 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -17,6 +17,7 @@ release_type=$(echo $release_message | grep -Po '(internal\s)*(community|enterpr if [[ $release_type =~ "community" ]]; then echo "Setting Community Release variables..." + export RELEASE_TYPE="community" if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" @@ -28,6 +29,7 @@ if [[ $release_type =~ "community" ]]; then fi elif [[ $release_type =~ "enterprise" ]]; then echo "Setting Enterprise Release variables..." + export RELEASE_TYPE="enterprise" if [[ $release_type =~ "internal" ]]; then echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" From 43bd406390ef7e154dd81eb86c2948339c40bff0 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 12:50:59 +0300 Subject: [PATCH 010/153] APPS-241: - add merge branch and comment release script to test the release --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7198c571c..ddb70c2a3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,11 +110,11 @@ jobs: - name: "Release" stage: Release and Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ + if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ merge.*) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ before_script: bash scripts/set-release-variables.sh script: - - bash scripts/release.sh ${RELEASE_TYPE} +# - bash scripts/release.sh ${RELEASE_TYPE} before_deploy: - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} deploy: From a6dad074ff764432e8028a7cf39eab6caa0e957a Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:06:48 +0300 Subject: [PATCH 011/153] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ddb70c2a3a..7d067fd9f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,7 +114,7 @@ jobs: before_script: bash scripts/set-release-variables.sh script: -# - bash scripts/release.sh ${RELEASE_TYPE} + - bash scripts/release.sh ${RELEASE_TYPE} before_deploy: - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} deploy: From 306d8912901ca299d978214f1c4a4666d72c4058 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:14:37 +0300 Subject: [PATCH 012/153] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d067fd9f3..4137c5402f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ branches: only: - /release\/V2.7.*/ - /feature-2.7\/.*/ - - /merge-2.7\/.*/ + - merge-2.7\/.*/ - /hotfix-2.7\/.*/ cache: From 7a071e42de35ab82267b25fd12f3fe9d422c7556 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:18:01 +0300 Subject: [PATCH 013/153] APPS-241: Revert changes --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4137c5402f..c7198c571c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ branches: only: - /release\/V2.7.*/ - /feature-2.7\/.*/ - - merge-2.7\/.*/ + - /merge-2.7\/.*/ - /hotfix-2.7\/.*/ cache: @@ -110,7 +110,7 @@ jobs: - name: "Release" stage: Release and Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ merge.*) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ before_script: bash scripts/set-release-variables.sh script: From dc3a9728fd81b57065179c1ec19d88312727e6b0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 15 Oct 2020 12:35:57 +0300 Subject: [PATCH 014/153] APPS-238 Execute community UI tests in travis --- .travis.yml | 24 ++++++++++++++++++++++-- travis-env-vars.yml | 4 ++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59d981a1c6..24a6b0ff22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ language: java jdk: - openjdk8 +addons: + firefox: "43.0.1" + branches: only: - /release\/V2.7.*/ @@ -26,6 +29,7 @@ before_install: install: skip services: + - xvfb - docker stages: @@ -68,6 +72,7 @@ jobs: stage: Tests script: - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" stage: Tests before_install: @@ -76,6 +81,7 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise Rest API Tests" stage: Tests before_install: @@ -84,14 +90,27 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community UI Tests ..." + + - name: "Community UI Tests" stage: Tests + env: + - testSuiteName: communitySmokeInPlaceRecords.xml + - testSuiteName: communitySmokeRMSite.xml + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Community UI Tests ..." + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$testSuiteName -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Enterprise UI Tests ..." stage: Tests before_install: @@ -100,6 +119,7 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - echo "Enterprise UI Tests ..." + - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/travis-env-vars.yml b/travis-env-vars.yml index cb6c4b75d6..e228b6022a 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,3 +4,7 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8080/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' From 0207b71f21bfaecf7f20df969be69d4cb4e8d253 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 15 Oct 2020 14:47:18 +0300 Subject: [PATCH 015/153] APPS-238 Execute community UI tests in travis --- .travis.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a6b0ff22..5aa2a31722 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,11 +91,8 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community UI Tests" + - name: "Community Smoke UI Tests for In place Records" stage: Tests - env: - - testSuiteName: communitySmokeInPlaceRecords.xml - - testSuiteName: communitySmokeRMSite.xml addons: firefox: "43.0.1" artifacts: @@ -109,7 +106,24 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$testSuiteName -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - name: "Community Smoke UI Tests for actions in RM site" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise UI Tests ..." stage: Tests From 2f9fac74428c289f4a2cf534c4d6e9b36121c7c4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 15 Oct 2020 14:57:54 +0300 Subject: [PATCH 016/153] APPS-238 Added job for community Level2 UI tests --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5aa2a31722..acf1cad10d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,6 +125,23 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Community Level 2 UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Enterprise UI Tests ..." stage: Tests before_install: From c43139a777be6d75e65b8047ec41963593ca56a0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 15 Oct 2020 15:45:24 +0300 Subject: [PATCH 017/153] APPS-238 Added job for enterprise Level2 UI tests --- .travis.yml | 79 ++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index acf1cad10d..689321cc6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,6 @@ language: java jdk: - openjdk8 -addons: - firefox: "43.0.1" - branches: only: - /release\/V2.7.*/ @@ -33,7 +30,7 @@ services: - docker stages: - - name: Build AGS +# - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans @@ -42,36 +39,36 @@ stages: jobs: include: - - name: "Build AGS Community" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Benchmark" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" +# - name: "Build AGS Community" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Enterprise" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Benchmark" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Community Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Community Integrations Tests on MySQL" +# - name: "Enterprise Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" stage: Tests @@ -106,7 +103,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Smoke UI Tests for actions in RM site" stage: Tests @@ -142,14 +139,22 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise UI Tests ..." + - name: "Enterprise Level 2 UI Tests" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Enterprise UI Tests ..." + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans From e9e66d33a8d324ce6be050212fbc738a8acccc54 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 15 Oct 2020 21:09:57 +0300 Subject: [PATCH 018/153] APPS-238 Added job for enterprise Level2 classification tests --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 689321cc6f..731f903db9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,6 +156,23 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Classification Level 2 UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Source Clear Scan (SCA)" stage: Security Scans script: From 374fb6a0090b3101c5b93aef8ccb0145f5b5338b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 08:29:37 +0300 Subject: [PATCH 019/153] APPS-238 Added jobs for enterprise UI tests --- .travis.yml | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 731f903db9..75b4d8bd2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Classification Level 2 UI Tests" + - name: "Enterprise Classification Level 2 UI Tests" stage: Tests addons: firefox: "43.0.1" @@ -173,6 +173,74 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Enterprise Classification UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - name: "Enterprise Guides UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - name: "Enterprise Security Marks UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - name: "Enterprise Console and Configuration UI Tests" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Source Clear Scan (SCA)" stage: Security Scans script: From b8445f276b250628b3da5f63266d92e4ea40c87f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 08:45:15 +0300 Subject: [PATCH 020/153] fix yml file --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75b4d8bd2a..4612f91c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -173,7 +173,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Classification UI Tests" + - name: "Enterprise Classification UI Tests" stage: Tests addons: firefox: "43.0.1" @@ -190,7 +190,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Guides UI Tests" + - name: "Enterprise Guides UI Tests" stage: Tests addons: firefox: "43.0.1" @@ -207,7 +207,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Security Marks UI Tests" + - name: "Enterprise Security Marks UI Tests" stage: Tests addons: firefox: "43.0.1" @@ -224,7 +224,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Console and Configuration UI Tests" + - name: "Enterprise Console and Configuration UI Tests" stage: Tests addons: firefox: "43.0.1" From 78c706465af7ed8fc4521dd299b90a8b45c42adb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 09:06:42 +0300 Subject: [PATCH 021/153] use a matrix for running enterprise UI tests in parallel --- .travis.yml | 185 +++++++++++++++++++++++++++++----------------------- 1 file changed, 102 insertions(+), 83 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4612f91c6a..17852b1bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,15 @@ services: - xvfb - docker +env: + matrix: + - TEST_SUITE=enterpriseLevel2Tests.xml + - TEST_SUITE=enterpriseLevel2ClassificationTests.xml + - TEST_SUITE=enterpriseClassificationTests.xml + - TEST_SUITE=enterpriseGuidesTests.xml + - TEST_SUITE=enterpriseSecurityMarksTests.xml + - TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml + stages: # - name: Build AGS - name: Tests @@ -72,6 +81,7 @@ jobs: - name: "Community Rest API Tests" stage: Tests + env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target @@ -81,6 +91,7 @@ jobs: - name: "Enterprise Rest API Tests" stage: Tests + env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target @@ -90,6 +101,7 @@ jobs: - name: "Community Smoke UI Tests for In place Records" stage: Tests + env: # no environment variables - overwrite with empty addons: firefox: "43.0.1" artifacts: @@ -107,6 +119,7 @@ jobs: - name: "Community Smoke UI Tests for actions in RM site" stage: Tests + env: # no environment variables - overwrite with empty addons: firefox: "43.0.1" artifacts: @@ -124,6 +137,7 @@ jobs: - name: "Community Level 2 UI Tests" stage: Tests + env: # no environment variables - overwrite with empty addons: firefox: "43.0.1" artifacts: @@ -139,7 +153,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Level 2 UI Tests" + - name: "Enterprise UI Tests" stage: Tests addons: firefox: "43.0.1" @@ -154,112 +168,117 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Classification Level 2 UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# - name: "Enterprise Classification Level 2 UI Tests" +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Classification UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# - name: "Enterprise Classification UI Tests" +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Guides UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# - name: "Enterprise Guides UI Tests" +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Security Marks UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - name: "Enterprise Console and Configuration UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# - name: "Enterprise Security Marks UI Tests" +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# +# - name: "Enterprise Console and Configuration UI Tests" +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans + env: # no environment variables - overwrite with empty script: - echo "Source Clear Scan (SCA)" - name: "Static Analysis (SAST)" stage: Security Scans + env: # no environment variables - overwrite with empty script: - echo "Static Analysis (SAST)" - name: "Community Release" stage: Release + env: # no environment variables - overwrite with empty script: - echo "Community Release" - name: "Enterprise Release" stage: Release + env: # no environment variables - overwrite with empty script: - echo "Enterprise Release" - name: "Copy to S3 Release Bucket" stage: Publish + env: # no environment variables - overwrite with empty script: - echo "Copy to S3 Release Bucket" From 2e025982a3a752c15fe84aa9f5ef9b080ec16a81 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 09:52:26 +0300 Subject: [PATCH 022/153] try again to run enterprise UI tests in parallel --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17852b1bba..44a1b5609f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,10 +163,10 @@ jobs: - ./rm-automation/rm-automation-ui/target/reports - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER - before_install: + before_script: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + - travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From a70c1d45554dda51a0e14d886cb8afa1ae2c9aa1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 11:20:30 +0300 Subject: [PATCH 023/153] try again to run enterprise UI tests in parallel --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44a1b5609f..363561a0c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,11 +163,10 @@ jobs: - ./rm-automation/rm-automation-ui/target/reports - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER - before_script: + script: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} # - name: "Enterprise Classification Level 2 UI Tests" From 4aec8081d93edd98d248cb83c36c0d2932b3679d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 12:25:50 +0300 Subject: [PATCH 024/153] try again to run enterprise UI tests in parallel using shared_job configuration --- .travis.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 363561a0c6..d2b947f82e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,15 +29,6 @@ services: - xvfb - docker -env: - matrix: - - TEST_SUITE=enterpriseLevel2Tests.xml - - TEST_SUITE=enterpriseLevel2ClassificationTests.xml - - TEST_SUITE=enterpriseClassificationTests.xml - - TEST_SUITE=enterpriseGuidesTests.xml - - TEST_SUITE=enterpriseSecurityMarksTests.xml - - TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - stages: # - name: Build AGS - name: Tests @@ -46,6 +37,22 @@ stages: - name: Release - name: Publish +_shared_job: &enterprise_UI_shared_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xm + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + jobs: include: # - name: "Build AGS Community" @@ -153,22 +160,15 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise UI Tests" + - name: "Enterprise Level 2 UI Tests" stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - script: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - - travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + env: TEST_SUITE=enterpriseLevel2Tests.xml + <<: *enterprise_UI_shared_configuration + - name: "Enterprise Classification Level 2 UI Tests" + stage: Tests + env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml + <<: *enterprise_UI_shared_configuration # - name: "Enterprise Classification Level 2 UI Tests" # stage: Tests # addons: From 5e965d77e814941a31ca6f472d39705bb014ae79 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 13:23:33 +0300 Subject: [PATCH 025/153] try to run all UI tests in parallel using shared_job configuration --- .travis.yml | 150 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2b947f82e..ed35e4317e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ stages: - name: Release - name: Publish -_shared_job: &enterprise_UI_shared_configuration +_shared_job: &UI_shared_configuration addons: firefox: "43.0.1" artifacts: @@ -46,12 +46,12 @@ _shared_job: &enterprise_UI_shared_configuration - ./rm-automation/rm-automation-ui/target/reports - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xm - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,$PROFILE -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -106,69 +106,105 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# - name: "Community Smoke UI Tests for In place Records" +# stage: Tests +# env: # no environment variables - overwrite with empty +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# +# - name: "Community Smoke UI Tests for actions in RM site" +# stage: Tests +# env: # no environment variables - overwrite with empty +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +# +# - name: "Community Level 2 UI Tests" +# stage: Tests +# env: # no environment variables - overwrite with empty +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Community Smoke UI Tests for In place Records" stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - + env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml + <<: *UI_shared_configuration + - name: "Community Smoke UI Tests for actions in RM site" stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeRMSite.xml + <<: *UI_shared_configuration - name: "Community Level 2 UI Tests" stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + env: PROFILE=apply-rm-community TEST_SUITE=communityLevel2Tests.xml + <<: *UI_shared_configuration - name: "Enterprise Level 2 UI Tests" stage: Tests - env: TEST_SUITE=enterpriseLevel2Tests.xml - <<: *enterprise_UI_shared_configuration + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2Tests.xml + <<: *UI_shared_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests - env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_UI_shared_configuration + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2ClassificationTests.xml + <<: *UI_shared_configuration + + - name: "Enterprise Classification UI Tests" + stage: Tests + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseClassificationTests.xml + <<: *UI_shared_configuration + + - name: "Enterprise Guides UI Tests" + stage: Tests + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseGuidesTests.xml + <<: *UI_shared_configuration + + - name: "Enterprise Security Marks UI Tests" + stage: Tests + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseSecurityMarksTests.xml + <<: *UI_shared_configuration + + - name: "Enterprise Console and Configuration UI Tests" + stage: Tests + env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml + <<: *UI_shared_configuration + # - name: "Enterprise Classification Level 2 UI Tests" # stage: Tests # addons: From 2d89fb7c7cac34561e9fcfad5d8061f7f204e884 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 14:00:03 +0300 Subject: [PATCH 026/153] try to run all UI tests in parallel using shared_job configuration --- .travis.yml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed35e4317e..1b4eb9920c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ stages: - name: Release - name: Publish -_shared_job: &UI_shared_configuration +_shared_job: &shared_UI_configuration addons: firefox: "43.0.1" artifacts: @@ -46,12 +46,12 @@ _shared_job: &UI_shared_configuration - ./rm-automation/rm-automation-ui/target/reports - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,$PROFILE -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,$PROFILE -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -88,7 +88,6 @@ jobs: - name: "Community Rest API Tests" stage: Tests - env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target @@ -98,7 +97,6 @@ jobs: - name: "Enterprise Rest API Tests" stage: Tests - env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target @@ -108,7 +106,6 @@ jobs: # - name: "Community Smoke UI Tests for In place Records" # stage: Tests -# env: # no environment variables - overwrite with empty # addons: # firefox: "43.0.1" # artifacts: @@ -126,7 +123,6 @@ jobs: # # - name: "Community Smoke UI Tests for actions in RM site" # stage: Tests -# env: # no environment variables - overwrite with empty # addons: # firefox: "43.0.1" # artifacts: @@ -144,7 +140,6 @@ jobs: # # - name: "Community Level 2 UI Tests" # stage: Tests -# env: # no environment variables - overwrite with empty # addons: # firefox: "43.0.1" # artifacts: @@ -163,47 +158,47 @@ jobs: - name: "Community Smoke UI Tests for In place Records" stage: Tests env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml - <<: *UI_shared_configuration - + <<: *shared_UI_configuration + - name: "Community Smoke UI Tests for actions in RM site" stage: Tests env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeRMSite.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Community Level 2 UI Tests" stage: Tests env: PROFILE=apply-rm-community TEST_SUITE=communityLevel2Tests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Level 2 UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2Tests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Classification UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseClassificationTests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseGuidesTests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Security Marks UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseSecurityMarksTests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" stage: Tests env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - <<: *UI_shared_configuration + <<: *shared_UI_configuration # - name: "Enterprise Classification Level 2 UI Tests" # stage: Tests From 22283efa0fd5a620fd4e42ca946a46fc98d92227 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 14:11:26 +0300 Subject: [PATCH 027/153] overwrite env with empty for rest api tests jobs --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1b4eb9920c..067e046156 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,7 @@ jobs: - name: "Community Rest API Tests" stage: Tests + env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target @@ -97,6 +98,7 @@ jobs: - name: "Enterprise Rest API Tests" stage: Tests + env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target From 147cd2fb8e6a05e4183fac8693ef0ded07395d96 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 14:37:20 +0300 Subject: [PATCH 028/153] try to run only enterprise UI tests in parallel using shared_job configuration --- .travis.yml | 129 +++++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/.travis.yml b/.travis.yml index 067e046156..b7dab5bd72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,100 +106,103 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# - name: "Community Smoke UI Tests for In place Records" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} -# -# - name: "Community Smoke UI Tests for actions in RM site" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} -# -# - name: "Community Level 2 UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Community Smoke UI Tests for In place Records" stage: Tests - env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml - <<: *shared_UI_configuration + env: # no environment variables - overwrite with empty + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Smoke UI Tests for actions in RM site" stage: Tests - env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeRMSite.xml - <<: *shared_UI_configuration + env: # no environment variables - overwrite with empty + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Level 2 UI Tests" stage: Tests - env: PROFILE=apply-rm-community TEST_SUITE=communityLevel2Tests.xml - <<: *shared_UI_configuration + env: # no environment variables - overwrite with empty + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + +# - name: "Community Smoke UI Tests for In place Records" +# stage: Tests +# env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml +# <<: *shared_UI_configuration +# +# - name: "Community Smoke UI Tests for actions in RM site" +# stage: Tests +# env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeRMSite.xml +# <<: *shared_UI_configuration +# +# - name: "Community Level 2 UI Tests" +# stage: Tests +# env: PROFILE=apply-rm-community TEST_SUITE=communityLevel2Tests.xml +# <<: *shared_UI_configuration - name: "Enterprise Level 2 UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2Tests.xml + env: TEST_SUITE=enterpriseLevel2Tests.xml <<: *shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseLevel2ClassificationTests.xml + env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml <<: *shared_UI_configuration - name: "Enterprise Classification UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseClassificationTests.xml + env: TEST_SUITE=enterpriseClassificationTests.xml <<: *shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseGuidesTests.xml + env: TEST_SUITE=enterpriseGuidesTests.xml <<: *shared_UI_configuration - name: "Enterprise Security Marks UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseSecurityMarksTests.xml + env: TEST_SUITE=enterpriseSecurityMarksTests.xml <<: *shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" stage: Tests - env: PROFILE=apply-rm-enterprise TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml + env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml <<: *shared_UI_configuration # - name: "Enterprise Classification Level 2 UI Tests" From 74177fef38fd4682a86d67524b32fb50b4dd17ff Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 14:38:35 +0300 Subject: [PATCH 029/153] try to run only enterprise UI tests in parallel using shared_job configuration --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7dab5bd72..caef5c81de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ stages: - name: Release - name: Publish -_shared_job: &shared_UI_configuration +_shared_job: &enterprise_shared_UI_configuration addons: firefox: "43.0.1" artifacts: @@ -49,7 +49,7 @@ _shared_job: &shared_UI_configuration before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,$PROFILE -q -f $AUTOMATION_UI_PATH/pom.xml + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -178,32 +178,32 @@ jobs: - name: "Enterprise Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" stage: Tests env: TEST_SUITE=enterpriseClassificationTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Security Marks UI Tests" stage: Tests env: TEST_SUITE=enterpriseSecurityMarksTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" stage: Tests env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration # - name: "Enterprise Classification Level 2 UI Tests" # stage: Tests From 666c12f68afb0861a53bd32fca021d7651e1f4b9 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 15:04:39 +0300 Subject: [PATCH 030/153] try to run community UI tests in parallel using shared_job configuration --- .travis.yml | 72 +++++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index caef5c81de..6993ee1914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,60 +106,34 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Smoke UI Tests for In place Records" - stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Community Smoke UI Tests for actions in RM site" stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + env: TEST_SUITE=communitySmokeRMSite.xml + - &community_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Community Smoke UI Tests for In place Records" + stage: Tests + env: TEST_SUITE=communitySmokeInPlaceRecords.xml + - <<: *community_shared_UI_configuration + - name: "Community Level 2 UI Tests" stage: Tests - env: # no environment variables - overwrite with empty - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - + env: TEST_SUITE=communityLevel2Tests.xml + - <<: *community_shared_UI_configuration # - name: "Community Smoke UI Tests for In place Records" # stage: Tests # env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml From a86a24fedc427bc38ed5d5c80678a3188db09368 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 16:21:54 +0300 Subject: [PATCH 031/153] try again to run community UI tests in parallel using shared_job configuration --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6993ee1914..578a1e40d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,26 +110,26 @@ jobs: stage: Tests env: TEST_SUITE=communitySmokeRMSite.xml - &community_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Smoke UI Tests for In place Records" stage: Tests env: TEST_SUITE=communitySmokeInPlaceRecords.xml - <<: *community_shared_UI_configuration - + - name: "Community Level 2 UI Tests" stage: Tests env: TEST_SUITE=communityLevel2Tests.xml From ba7b15696825d81e85aa0338ed2e06bbafaa93ab Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 16:24:37 +0300 Subject: [PATCH 032/153] try again to run community UI tests in parallel using shared_job configuration --- .travis.yml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 578a1e40d7..5d396c6ffc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ stages: - name: Release - name: Publish -_shared_job: &enterprise_shared_UI_configuration +_shared_enterprise_job: &enterprise_shared_UI_configuration addons: firefox: "43.0.1" artifacts: @@ -53,6 +53,22 @@ _shared_job: &enterprise_shared_UI_configuration script: - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +_shared_community_job: &community_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + jobs: include: # - name: "Build AGS Community" @@ -109,21 +125,7 @@ jobs: - name: "Community Smoke UI Tests for actions in RM site" stage: Tests env: TEST_SUITE=communitySmokeRMSite.xml - - &community_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - <<: *community_shared_UI_configuration - name: "Community Smoke UI Tests for In place Records" stage: Tests @@ -134,6 +136,7 @@ jobs: stage: Tests env: TEST_SUITE=communityLevel2Tests.xml - <<: *community_shared_UI_configuration + # - name: "Community Smoke UI Tests for In place Records" # stage: Tests # env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml From df7e2fc31dcf325f77533cd490a0c024f2da53ec Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 16:28:13 +0300 Subject: [PATCH 033/153] try to run all UI tests in parallel using shared_job configuration --- .travis.yml | 61 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d396c6ffc..00074b8f0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,37 +37,38 @@ stages: - name: Release - name: Publish -_shared_enterprise_job: &enterprise_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +_shared_job: + - &enterprise_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} -_shared_community_job: &community_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - &community_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: From 7172cb0442e6df04fd31e80a9ca04d55a0d7c5ac Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 16:50:21 +0300 Subject: [PATCH 034/153] try to run all UI tests in parallel using shared_job configuration --- .travis.yml | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00074b8f0f..2bb8441008 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,7 @@ stages: - name: Release - name: Publish -_shared_job: - - &enterprise_shared_UI_configuration +_shared_job: &shared_UI_configuration addons: firefox: "43.0.1" artifacts: @@ -54,22 +53,6 @@ _shared_job: script: - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - &community_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - jobs: include: # - name: "Build AGS Community" @@ -126,17 +109,20 @@ jobs: - name: "Community Smoke UI Tests for actions in RM site" stage: Tests env: TEST_SUITE=communitySmokeRMSite.xml - - <<: *community_shared_UI_configuration + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + - <<: *shared_UI_configuration - name: "Community Smoke UI Tests for In place Records" stage: Tests env: TEST_SUITE=communitySmokeInPlaceRecords.xml - - <<: *community_shared_UI_configuration + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + - <<: *shared_UI_configuration - name: "Community Level 2 UI Tests" stage: Tests env: TEST_SUITE=communityLevel2Tests.xml - - <<: *community_shared_UI_configuration + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + - <<: *shared_UI_configuration # - name: "Community Smoke UI Tests for In place Records" # stage: Tests @@ -156,32 +142,32 @@ jobs: - name: "Enterprise Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration - name: "Enterprise Classification UI Tests" stage: Tests env: TEST_SUITE=enterpriseClassificationTests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration - name: "Enterprise Security Marks UI Tests" stage: Tests env: TEST_SUITE=enterpriseSecurityMarksTests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" stage: Tests env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - <<: *enterprise_shared_UI_configuration + <<: *shared_UI_configuration # - name: "Enterprise Classification Level 2 UI Tests" # stage: Tests From 8f5e44d20e283bfbc908c84c80715c10fa15cd13 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 16:53:10 +0300 Subject: [PATCH 035/153] try to fix configuration --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bb8441008..8331aa6fbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,19 +110,19 @@ jobs: stage: Tests env: TEST_SUITE=communitySmokeRMSite.xml install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - - <<: *shared_UI_configuration + <<: *shared_UI_configuration - name: "Community Smoke UI Tests for In place Records" stage: Tests env: TEST_SUITE=communitySmokeInPlaceRecords.xml install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - - <<: *shared_UI_configuration + <<: *shared_UI_configuration - name: "Community Level 2 UI Tests" stage: Tests env: TEST_SUITE=communityLevel2Tests.xml install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - - <<: *shared_UI_configuration + <<: *shared_UI_configuration # - name: "Community Smoke UI Tests for In place Records" # stage: Tests From 253d7decb8bd34b46042297db6be1cfbadd78a51 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 17:03:40 +0300 Subject: [PATCH 036/153] try to use shared UI configuration --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8331aa6fbf..2b02c561f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,13 @@ _shared_job: &shared_UI_configuration before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + install: + - | + if [[ ${TRAVIS_JOB_NAME} == *Community* ]]; then + travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + else + travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + fi script: - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -109,19 +115,16 @@ jobs: - name: "Community Smoke UI Tests for actions in RM site" stage: Tests env: TEST_SUITE=communitySmokeRMSite.xml - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml <<: *shared_UI_configuration - name: "Community Smoke UI Tests for In place Records" stage: Tests env: TEST_SUITE=communitySmokeInPlaceRecords.xml - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml <<: *shared_UI_configuration - name: "Community Level 2 UI Tests" stage: Tests env: TEST_SUITE=communityLevel2Tests.xml - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml <<: *shared_UI_configuration # - name: "Community Smoke UI Tests for In place Records" From 1965cb3050d1abf776069d7973d2004d9936123b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 16 Oct 2020 17:32:32 +0300 Subject: [PATCH 037/153] don't use shared UI configuration for community UI tests jobs --- .travis.yml | 209 +++++++++++++++++----------------------------------- 1 file changed, 66 insertions(+), 143 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b02c561f5..25caffc74a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,27 +37,21 @@ stages: - name: Release - name: Publish -_shared_job: &shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: - - | - if [[ ${TRAVIS_JOB_NAME} == *Community* ]]; then - travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - else - travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - fi - script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} +_shared_job: &enterprise_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -94,7 +88,6 @@ jobs: - name: "Community Rest API Tests" stage: Tests - env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target @@ -104,7 +97,6 @@ jobs: - name: "Enterprise Rest API Tests" stage: Tests - env: # no environment variables - overwrite with empty before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target @@ -112,175 +104,106 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Smoke UI Tests for actions in RM site" - stage: Tests - env: TEST_SUITE=communitySmokeRMSite.xml - <<: *shared_UI_configuration - - name: "Community Smoke UI Tests for In place Records" stage: Tests - env: TEST_SUITE=communitySmokeInPlaceRecords.xml - <<: *shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - name: "Community Smoke UI Tests for actions in RM site" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Level 2 UI Tests" stage: Tests - env: TEST_SUITE=communityLevel2Tests.xml - <<: *shared_UI_configuration - -# - name: "Community Smoke UI Tests for In place Records" -# stage: Tests -# env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeInPlaceRecords.xml -# <<: *shared_UI_configuration -# -# - name: "Community Smoke UI Tests for actions in RM site" -# stage: Tests -# env: PROFILE=apply-rm-community TEST_SUITE=communitySmokeRMSite.xml -# <<: *shared_UI_configuration -# -# - name: "Community Level 2 UI Tests" -# stage: Tests -# env: PROFILE=apply-rm-community TEST_SUITE=communityLevel2Tests.xml -# <<: *shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" stage: Tests env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" stage: Tests env: TEST_SUITE=enterpriseClassificationTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Security Marks UI Tests" stage: Tests env: TEST_SUITE=enterpriseSecurityMarksTests.xml - <<: *shared_UI_configuration + <<: *enterprise_shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" stage: Tests env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - <<: *shared_UI_configuration - -# - name: "Enterprise Classification Level 2 UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - -# - name: "Enterprise Classification UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - -# - name: "Enterprise Guides UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - -# - name: "Enterprise Security Marks UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} -# -# - name: "Enterprise Console and Configuration UI Tests" -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + <<: *enterprise_shared_UI_configuration - name: "Source Clear Scan (SCA)" stage: Security Scans - env: # no environment variables - overwrite with empty script: - echo "Source Clear Scan (SCA)" - name: "Static Analysis (SAST)" stage: Security Scans - env: # no environment variables - overwrite with empty script: - echo "Static Analysis (SAST)" - name: "Community Release" stage: Release - env: # no environment variables - overwrite with empty script: - echo "Community Release" - name: "Enterprise Release" stage: Release - env: # no environment variables - overwrite with empty script: - echo "Enterprise Release" - name: "Copy to S3 Release Bucket" stage: Publish - env: # no environment variables - overwrite with empty script: - echo "Copy to S3 Release Bucket" From 608e9f46a321364c4990e94e59537f4a82f6d8ae Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 17:17:56 +0300 Subject: [PATCH 038/153] split classification suite --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25caffc74a..4a0355daaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,9 +165,14 @@ jobs: env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml <<: *enterprise_shared_UI_configuration - - name: "Enterprise Classification UI Tests" + - name: "Enterprise Content Classification UI Tests" stage: Tests - env: TEST_SUITE=enterpriseClassificationTests.xml + env: TEST_SUITE=enterpriseContentClassificationTests.xml + <<: *enterprise_shared_UI_configuration + + - name: "Enterprise Folders Classification UI Tests" + stage: Tests + env: TEST_SUITE=enterpriseFoldersClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" From ebb80f377cb11db1c030bc06b50270d510c94e4b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 17:48:14 +0300 Subject: [PATCH 039/153] try to set screen resolution --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4a0355daaf..922134b0af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ _shared_job: &enterprise_shared_UI_configuration - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + before-script: xvfb-run --server-args="-screen 0 1024x768x24" make test script: - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From fe237d573cddd22669ab3b98f028893d6d62b515 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 18:00:37 +0300 Subject: [PATCH 040/153] try to set screen resolution --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 922134b0af..6d0b9a10c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,9 +50,8 @@ _shared_job: &enterprise_shared_UI_configuration - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - before-script: xvfb-run --server-args="-screen 0 1024x768x24" make test script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -171,10 +170,10 @@ jobs: env: TEST_SUITE=enterpriseContentClassificationTests.xml <<: *enterprise_shared_UI_configuration - - name: "Enterprise Folders Classification UI Tests" - stage: Tests - env: TEST_SUITE=enterpriseFoldersClassificationTests.xml - <<: *enterprise_shared_UI_configuration +# - name: "Enterprise Folders Classification UI Tests" +# stage: Tests +# env: TEST_SUITE=enterpriseFoldersClassificationTests.xml +# <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" stage: Tests From 9b941b1f15d90736d836002b198d956606ad7e82 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 18:08:15 +0300 Subject: [PATCH 041/153] try to set screen resolution --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d0b9a10c3..b6de509546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: install: skip services: - - xvfb +# - xvfb - docker stages: From 7bc5be6e5ed378d85c663975f9e83719a388805c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 18:13:20 +0300 Subject: [PATCH 042/153] Revert "split classification suite" This reverts commit 608e9f46 --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6de509546..4d36b47fac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,16 +165,11 @@ jobs: env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml <<: *enterprise_shared_UI_configuration - - name: "Enterprise Content Classification UI Tests" + - name: "Enterprise Classification UI Tests" stage: Tests - env: TEST_SUITE=enterpriseContentClassificationTests.xml + env: TEST_SUITE=enterpriseClassificationTests.xml <<: *enterprise_shared_UI_configuration -# - name: "Enterprise Folders Classification UI Tests" -# stage: Tests -# env: TEST_SUITE=enterpriseFoldersClassificationTests.xml -# <<: *enterprise_shared_UI_configuration - - name: "Enterprise Guides UI Tests" stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml From 71b38d12e8c524347910838b2d6e3edf8dc1cda0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 18:58:40 +0300 Subject: [PATCH 043/153] set screen resolution to 1280x768 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d36b47fac..1b199bdc87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ _shared_job: &enterprise_shared_UI_configuration - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -119,7 +119,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Smoke UI Tests for actions in RM site" stage: Tests @@ -136,7 +136,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Level 2 UI Tests" stage: Tests @@ -153,7 +153,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" stage: Tests From b5f824ed7a4693dd2c159e8bd54ab09fa4e70757 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 20:36:31 +0300 Subject: [PATCH 044/153] set screen resolution to 1280x1024 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b199bdc87..94639f16c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ _shared_job: &enterprise_shared_UI_configuration - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -119,7 +119,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Smoke UI Tests for actions in RM site" stage: Tests @@ -136,7 +136,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Community Level 2 UI Tests" stage: Tests @@ -153,7 +153,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" stage: Tests From b5bb5311f398e567c169dd56b1602ef84214a920 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 20:45:55 +0300 Subject: [PATCH 045/153] move info about stage in shared job --- .travis.yml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94639f16c1..a57c1beaec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,20 +38,21 @@ stages: - name: Publish _shared_job: &enterprise_shared_UI_configuration - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -156,32 +157,32 @@ jobs: - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Security Marks UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseSecurityMarksTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" - stage: Tests +# stage: Tests env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml <<: *enterprise_shared_UI_configuration From 5b2e95fa32e7655acce247613950defc85946ec1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 20:56:15 +0300 Subject: [PATCH 046/153] try again to not duplicate community jobs configuration --- .travis.yml | 74 +++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index a57c1beaec..9d9cd90e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,8 +105,10 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Smoke UI Tests for In place Records" + - &community_shared_UI_config + name: "Community Smoke UI Tests for In place Records" stage: Tests + env: SUITE=communitySmokeInPlaceRecords.xml addons: firefox: "43.0.1" artifacts: @@ -120,41 +122,45 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Community Smoke UI Tests for actions in RM site" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - <<: *community_shared_UI_config + name: "Community Smoke UI Tests for actions in RM site" + env: SUITE=communitySmokeRMSite.xml +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Community Level 2 UI Tests" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - <<: *community_shared_UI_config + name: "Community Level 2 UI Tests" + env: SUITE=communityLevel2Tests.xml +# stage: Tests +# addons: +# firefox: "43.0.1" +# artifacts: +# paths: +# - ./rm-automation/rm-automation-ui/target/surefire-reports +# - ./rm-automation/rm-automation-ui/target/reports +# - ./rm-automation/rm-automation-ui/target/screenshots +# target_paths: $TRAVIS_BUILD_NUMBER +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml +# script: +# - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" # stage: Tests From ed1aa794e2ec9e77ea93932230244f14921b15bd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 17 Oct 2020 21:07:20 +0300 Subject: [PATCH 047/153] try again to not duplicate community jobs configuration --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d9cd90e0a..b2d4f89c6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,7 +108,6 @@ jobs: - &community_shared_UI_config name: "Community Smoke UI Tests for In place Records" stage: Tests - env: SUITE=communitySmokeInPlaceRecords.xml addons: firefox: "43.0.1" artifacts: @@ -122,11 +121,11 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" - env: SUITE=communitySmokeRMSite.xml +# env: SUITE=communitySmokeRMSite.xml # stage: Tests # addons: # firefox: "43.0.1" @@ -140,12 +139,12 @@ jobs: # - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q # - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target # install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" - env: SUITE=communityLevel2Tests.xml +# env: SUITE=communityLevel2Tests.xml # stage: Tests # addons: # firefox: "43.0.1" @@ -159,8 +158,8 @@ jobs: # - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q # - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target # install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml -# script: -# - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" # stage: Tests From a12372908aae416a17d5502499f4cfe751cb25c5 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 18 Oct 2020 11:17:20 +0300 Subject: [PATCH 048/153] set screen resolution to 1152x864 --- .travis.yml | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2d4f89c6c..24276dc4dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ _shared_job: &enterprise_shared_UI_configuration - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -121,73 +121,39 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" -# env: SUITE=communitySmokeRMSite.xml -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" -# env: SUITE=communityLevel2Tests.xml -# stage: Tests -# addons: -# firefox: "43.0.1" -# artifacts: -# paths: -# - ./rm-automation/rm-automation-ui/target/surefire-reports -# - ./rm-automation/rm-automation-ui/target/reports -# - ./rm-automation/rm-automation-ui/target/screenshots -# target_paths: $TRAVIS_BUILD_NUMBER -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseGuidesTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Security Marks UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseSecurityMarksTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" -# stage: Tests env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml <<: *enterprise_shared_UI_configuration From 0f4eb39171b32d2d7788538210374785ac002827 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 18 Oct 2020 16:39:32 +0300 Subject: [PATCH 049/153] set screen resolution to 1920x1080 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24276dc4dc..79eada7d87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ _shared_job: &enterprise_shared_UI_configuration - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} jobs: include: @@ -121,17 +121,17 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1152x864x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Enterprise Level 2 UI Tests" env: TEST_SUITE=enterpriseLevel2Tests.xml From 07d8b9b30b7f34a2b17d1e6a84d7842fc3df2ab2 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 07:27:16 +0300 Subject: [PATCH 050/153] split enterprise classification suite --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79eada7d87..0e457228d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,7 +142,11 @@ jobs: <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" - env: TEST_SUITE=enterpriseClassificationTests.xml + env: TEST_SUITE=enterpriseContentClassificationTests.xml + <<: *enterprise_shared_UI_configuration + + - name: "Enterprise Folders Classification UI Tests" + env: TEST_SUITE=enterpriseFoldersClassificationTests.xml <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" From 9029f1a1fccc3d478a5b5a39093d872d62d159bf Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 07:48:27 +0300 Subject: [PATCH 051/153] use anchor for enterprise UI tests --- .travis.yml | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e457228d9..f3a105d1a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,23 +37,6 @@ stages: - name: Release - name: Publish -_shared_job: &enterprise_shared_UI_configuration - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - jobs: include: # - name: "Build AGS Community" @@ -133,33 +116,48 @@ jobs: script: - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Level 2 UI Tests" + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" + stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml - <<: *enterprise_shared_UI_configuration + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Enterprise Classification Level 2 UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_shared_UI_configuration - - name: "Enterprise Classification UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification UI Tests" env: TEST_SUITE=enterpriseContentClassificationTests.xml - <<: *enterprise_shared_UI_configuration - - name: "Enterprise Folders Classification UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" env: TEST_SUITE=enterpriseFoldersClassificationTests.xml - <<: *enterprise_shared_UI_configuration - - name: "Enterprise Guides UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Guides UI Tests" env: TEST_SUITE=enterpriseGuidesTests.xml - <<: *enterprise_shared_UI_configuration - - name: "Enterprise Security Marks UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" env: TEST_SUITE=enterpriseSecurityMarksTests.xml - <<: *enterprise_shared_UI_configuration - - name: "Enterprise Console and Configuration UI Tests" + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console and Configuration UI Tests" env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml - <<: *enterprise_shared_UI_configuration - name: "Source Clear Scan (SCA)" stage: Security Scans From 775449147d05375c1a4dd969dc96e2a2d22e08cd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 08:03:05 +0300 Subject: [PATCH 052/153] test again --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3a105d1a2..cfd331a67e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,11 +141,11 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification UI Tests" - env: TEST_SUITE=enterpriseContentClassificationTests.xml + env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" - env: TEST_SUITE=enterpriseFoldersClassificationTests.xml + env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" From ab317916b26b284c91543cd1c9972bc60547fb45 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 08:11:24 +0300 Subject: [PATCH 053/153] test again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfd331a67e..7e2aa75632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,12 +140,12 @@ jobs: env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml - <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification UI Tests" - env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml + name: "Enterprise Content Classification UI Tests" + env: TEST_SUITE=enterpriseContentClassificationTests.xml - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" - env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml + env: TEST_SUITE=enterpriseFoldersClassificationTests.xml - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" From de4e9476674c387ae76b6a30b0f4ad3bd7db0770 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 08:25:19 +0300 Subject: [PATCH 054/153] test again --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e2aa75632..f13e695599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,11 +141,13 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" - env: TEST_SUITE=enterpriseContentClassificationTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" - env: TEST_SUITE=enterpriseFoldersClassificationTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" From b5a07abc2375c13c897642ad43ea5eba650201f4 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 19 Oct 2020 13:42:15 +0300 Subject: [PATCH 055/153] Update release script [skip tests] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- .travis.yml | 45 ++++++++++++++++---------------- scripts/release.sh | 7 ++--- scripts/set-release-variables.sh | 3 ++- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7198c571c..dc6a07f087 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,25 +109,26 @@ jobs: - echo "Static Analysis (SAST)" - name: "Release" - stage: Release and Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$ - before_script: - bash scripts/set-release-variables.sh - script: - - bash scripts/release.sh ${RELEASE_TYPE} - before_deploy: - - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} - deploy: - - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} - region: "eu-west-1" - bucket: ${ARTIFACTS_UPLOAD_BUCKET} - upload_dir: ${ARTIFACTS_UPLOAD_DIR} - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" \ No newline at end of file + stage: Release and Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /.*\[.*release.*\].*/ + before_script: + - echo ${TRAVIS_COMMIT_MESSAGE} + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh ${RELEASE_TYPE} + before_deploy: + - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: ${ARTIFACTS_UPLOAD_BUCKET} + upload_dir: ${ARTIFACTS_UPLOAD_DIR} + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" \ No newline at end of file diff --git a/scripts/release.sh b/scripts/release.sh index 77ede07469..499765aeee 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -8,6 +8,7 @@ git config user.email "${GIT_COMMITTER_EMAIL}" git config user.name "${GIT_COMMITTER_NAME}" release_type=$1 +echo Release type: "$release_type" if [ -z $release_type ]; then echo "Please provide a release type." @@ -21,11 +22,11 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" exit 1 else - mvn --batch-mode + mvn --batch-mode \ -Dusername="${GITHUB_USERNAME}" \ - -Dpassword="${GITHUB_PASSWORD}" \ + -Dpassword="${GITHUB_API_TOKEN}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -Prelease-${release_type} release:clean release:prepare release:perform + -P${release_type}-release release:clean release:prepare release:perform fi diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 56dfbb680e..0f18168c50 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\]') +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') if [ ! -n "$release_message" ]; then echo "The commit message is in the wrong format or it does not contain all the required properties." From f530744c7a06ee0bd6e0434c175948e1f4986619 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 13:54:30 +0300 Subject: [PATCH 056/153] uncomment Build stage --- .travis.yml | 63 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index f13e695599..8995d63d26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,10 @@ before_install: install: skip services: -# - xvfb - docker stages: -# - name: Build AGS + - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans @@ -39,36 +38,36 @@ stages: jobs: include: -# - name: "Build AGS Community" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Enterprise" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Benchmark" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Community Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Community Integrations Tests on MySQL" -# - name: "Enterprise Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Enterprise Integrations Tests on MySQL" + - name: "Build AGS Community" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Enterprise" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Benchmark" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" stage: Tests From 858036db3b5f897de9ecb6f6c8dffcb7f0494e54 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 19 Oct 2020 12:03:32 +0100 Subject: [PATCH 057/153] Set git username and API token via settings.xml file. --- .travis.settings.xml | 5 +++++ scripts/release.sh | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.settings.xml b/.travis.settings.xml index 411d7268b1..1c215aad0c 100644 --- a/.travis.settings.xml +++ b/.travis.settings.xml @@ -45,6 +45,11 @@ ${env.DOCKERHUB_USERNAME} ${env.DOCKERHUB_PASSWORD} + + github + ${env.GITHUB_USERNAME} + ${env.GITHUB_API_TOKEN} + alfresco-internal ${env.MAVEN_USERNAME} diff --git a/scripts/release.sh b/scripts/release.sh index 499765aeee..479e9ec97c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -23,8 +23,7 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; exit 1 else mvn --batch-mode \ - -Dusername="${GITHUB_USERNAME}" \ - -Dpassword="${GITHUB_API_TOKEN}" \ + -settings .travis.settings.xml \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ From fb18e0512cd7599a483d9ffe3bf4dc157d5338e0 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 19 Oct 2020 12:26:14 +0100 Subject: [PATCH 058/153] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] [skip tests] From 1515b90bb90ebbd34f624a1696e9d5327be7ae78 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 16:44:52 +0300 Subject: [PATCH 059/153] code review comments --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index e228b6022a..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From bd52a0929a0100db9eca2543205fae930ab7228e Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 19 Oct 2020 16:55:10 +0300 Subject: [PATCH 060/153] Update release script to use username and password and scm urls to use https [skip tests] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- pom.xml | 6 +++--- scripts/release.sh | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 4ec9b44259..5ae99fc8fd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://git@github.com/Alfresco/governance-services.git + scm:git:https://git@github.com/Alfresco/governance-services.git + scm:git:https://git@github.com/Alfresco/governance-services.git HEAD diff --git a/scripts/release.sh b/scripts/release.sh index 479e9ec97c..dad187a0b3 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -3,9 +3,6 @@ set -e # Use full history for release git checkout -B "${TRAVIS_BRANCH}" -# Add email to link commits to user -git config user.email "${GIT_COMMITTER_EMAIL}" -git config user.name "${GIT_COMMITTER_NAME}" release_type=$1 echo Release type: "$release_type" @@ -23,7 +20,8 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; exit 1 else mvn --batch-mode \ - -settings .travis.settings.xml \ + -Dusername="${GITHUB_USERNAME}" \ + -Dpassword="${GITHUB_PASSWORD}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ From dc9f861d62e6fedfbc6a97f829094bdebb8ce0a7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 19:48:02 +0300 Subject: [PATCH 061/153] set screen resolution to 1440x900 --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8995d63d26..0fbe68a0d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,17 +103,17 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -132,7 +132,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" @@ -141,12 +141,12 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" From dd07352556743ef12500f51a67dbb41a51caa487 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 20:06:22 +0300 Subject: [PATCH 062/153] delete -Dwebdriver.local.grid=true --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 2cc02543db..ce00ac7033 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' + - WEBDRIVER_ARGUMENTS='-Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 50fcac81a1a5ad7d85f290e59bca42ed73b5f76c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 19 Oct 2020 20:26:34 +0300 Subject: [PATCH 063/153] readded -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index ce00ac7033..4309116a88 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - WEBDRIVER_ARGUMENTS='-Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' + - WEBDRIVER_ARGUMENTS='-Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' From b96421af37c103482af4a78d4db954200ea71210 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 07:30:07 +0300 Subject: [PATCH 064/153] Revert "code review comments" This reverts commit 1515b90b --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 4309116a88..e228b6022a 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - WEBDRIVER_ARGUMENTS='-Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' From 0fdab0f7cdfe0da56a556d4e37f397a9b2b80f7f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 08:42:33 +0300 Subject: [PATCH 065/153] use -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30 --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index e228b6022a..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000' + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 10f5db82bc4c564e29ddaad7d99d3f436212c6e1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 09:27:36 +0300 Subject: [PATCH 066/153] added MAVEN_OPTS="-Xms1024m -Xmx1G -noverify" --- travis-env-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 2cc02543db..eee610db2f 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,5 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 + - MAVEN_OPTS="-Xms1024m -Xmx1G -noverify" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From f552314c65af1a761a06d3b04741f6c175ff9a45 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 10:12:51 +0300 Subject: [PATCH 067/153] Update scm urls [skip tests] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5ae99fc8fd..aae40bdd40 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://git@github.com/Alfresco/governance-services.git - scm:git:https://git@github.com/Alfresco/governance-services.git - scm:git:https://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD From ed5a18408174f1db3e96ef1c36732df80d639d3e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 10:51:51 +0300 Subject: [PATCH 068/153] added MAVEN_OPTS="-Xms1024m -Xmx1G -noverify" in before install --- .travis.yml | 2 ++ travis-env-vars.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0fbe68a0d1..a9d3271d49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,7 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: + - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml @@ -128,6 +129,7 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: + - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml diff --git a/travis-env-vars.yml b/travis-env-vars.yml index eee610db2f..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,5 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - MAVEN_OPTS="-Xms1024m -Xmx1G -noverify" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 912e0ef08d73eaa78642935e791cbbf4f3b49170 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 11:24:32 +0300 Subject: [PATCH 069/153] use shared_job for enterprise UI configuration --- .travis.yml | 108 ++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9d3271d49..a9855841ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,45 +29,63 @@ services: - docker stages: - - name: Build AGS +# - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release - name: Publish +_shared_job: &enterprise_shared_UI_configuration + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + jobs: include: - - name: "Build AGS Community" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Benchmark" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" +# - name: "Build AGS Community" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Enterprise" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Benchmark" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Community Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Community Integrations Tests on MySQL" +# - name: "Enterprise Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" stage: Tests @@ -104,37 +122,21 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - &enterprise_shared_UI_configuration + - <<: *enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" - stage: Tests env: TEST_SUITE=enterpriseLevel2Tests.xml - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" @@ -143,12 +145,12 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1440x900x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" From b2efbb6512479b47bfbb50fba7292e75c618a432 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 12:16:36 +0300 Subject: [PATCH 070/153] Do not use env for enterprise UI jobs --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9855841ac..3e0639b129 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,7 +140,8 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" - env: TEST_SUITE=enterpriseLevel2ClassificationTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" @@ -154,15 +155,18 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" - env: TEST_SUITE=enterpriseGuidesTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Security Marks UI Tests" - env: TEST_SUITE=enterpriseSecurityMarksTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Console and Configuration UI Tests" - env: TEST_SUITE=enterpriseConsoleAndConfigurationTests.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans From 3b8f419e6add53f4e201617a4ef5bffab1d798e5 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 12:22:30 +0300 Subject: [PATCH 071/153] Update git release vars [skip tests] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] --- .travis.settings.xml | 4 ++-- scripts/release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.settings.xml b/.travis.settings.xml index 1c215aad0c..396237a2c3 100644 --- a/.travis.settings.xml +++ b/.travis.settings.xml @@ -47,8 +47,8 @@ github - ${env.GITHUB_USERNAME} - ${env.GITHUB_API_TOKEN} + ${env.GIT_USERNAME} + ${env.GIT_PASSWORD} alfresco-internal diff --git a/scripts/release.sh b/scripts/release.sh index dad187a0b3..74311e0312 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -20,8 +20,8 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; exit 1 else mvn --batch-mode \ - -Dusername="${GITHUB_USERNAME}" \ - -Dpassword="${GITHUB_PASSWORD}" \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ From 375b2db822f2f2c876bb370a2dae44e042f86de5 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 12:25:54 +0300 Subject: [PATCH 072/153] Revert "use shared_job for enterprise UI configuration" This reverts commit 912e0ef0 --- .travis.yml | 99 ++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e0639b129..902390d1be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,63 +29,45 @@ services: - docker stages: -# - name: Build AGS + - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release - name: Publish -_shared_job: &enterprise_shared_UI_configuration - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml - script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - jobs: include: -# - name: "Build AGS Community" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Enterprise" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Benchmark" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Community Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Community Integrations Tests on MySQL" -# - name: "Enterprise Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Enterprise Integrations Tests on MySQL" + - name: "Build AGS Community" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Enterprise" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Benchmark" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" stage: Tests @@ -134,9 +116,24 @@ jobs: script: - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - <<: *enterprise_shared_UI_configuration + - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" - env: TEST_SUITE=enterpriseLevel2Tests.xml + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + script: + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" From 4069f1b369ea6931dedc1ff9c5a46640bad4979d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 14:35:41 +0300 Subject: [PATCH 073/153] check available memory sudo cat /proc/meminfo --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 902390d1be..7c0d377fbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,8 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc + - echo "MAVEN_OPTS='-Xms1024m -Xmx2G -noverify'" > ~/.mavenrc + - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml @@ -128,7 +129,8 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc + - echo "MAVEN_OPTS='-Xms1024m -Xmx2G -noverify'" > ~/.mavenrc + - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml From 2b8d8ce325fb7d2deed8c6824121340f41bca03c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 14:39:14 +0300 Subject: [PATCH 074/153] use MAVEN_SKIP_RC=true --- .travis.yml | 2 -- travis-env-vars.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c0d377fbb..2507c556eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,6 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx2G -noverify'" > ~/.mavenrc - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target @@ -129,7 +128,6 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - echo "MAVEN_OPTS='-Xms1024m -Xmx2G -noverify'" > ~/.mavenrc - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 2cc02543db..461c88a038 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,6 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 + - MAVEN_SKIP_RC=true + - MAVEN_OPTS="-Xms1024m -Xmx2G -noverify" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From afbbaee5fca706ce0c8d3a6d04839166dfe1309b Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 15:17:08 +0300 Subject: [PATCH 075/153] Split release stage into community and enterprise release and publish stages - copy artifacts from maven for publish job - simplify scripts --- .travis.settings.xml | 5 -- .travis.yml | 86 ++++++++++++++++++++++++++++---- scripts/release.sh | 16 +++--- scripts/set-release-variables.sh | 33 ++---------- scripts/setUpMavenPhase.sh | 3 +- scripts/zip-artifacts-release.sh | 27 ++++++++++ scripts/zip-artifacts-staging.sh | 15 ++++++ scripts/zip-artifacts.sh | 19 ------- 8 files changed, 132 insertions(+), 72 deletions(-) create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh delete mode 100755 scripts/zip-artifacts.sh diff --git a/.travis.settings.xml b/.travis.settings.xml index 396237a2c3..411d7268b1 100644 --- a/.travis.settings.xml +++ b/.travis.settings.xml @@ -45,11 +45,6 @@ ${env.DOCKERHUB_USERNAME} ${env.DOCKERHUB_PASSWORD} - - github - ${env.GIT_USERNAME} - ${env.GIT_PASSWORD} - alfresco-internal ${env.MAVEN_USERNAME} diff --git a/.travis.yml b/.travis.yml index dc6a07f087..f9eba90c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,10 @@ stages: - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans - - name: Release and Publish + - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ + - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ #TODO jobs: include: @@ -108,23 +111,88 @@ jobs: script: - echo "Static Analysis (SAST)" - - name: "Release" - stage: Release and Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /.*\[.*release.*\].*/ + - name: "Community Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[community release .*\]/ before_script: - - echo ${TRAVIS_COMMIT_MESSAGE} - source scripts/set-release-variables.sh script: - - bash scripts/release.sh ${RELEASE_TYPE} + - bash scripts/release.sh "community" before_deploy: - - bash scripts/zip-artifacts.sh ${RELEASE_TYPE} + - bash scripts/zip-artifacts-staging.sh "community" deploy: - provider: s3 access_key_id: ${ARTIFACTS_KEY} secret_access_key: ${ARTIFACTS_SECRET} region: "eu-west-1" - bucket: ${ARTIFACTS_UPLOAD_BUCKET} - upload_dir: ${ARTIFACTS_UPLOAD_DIR} + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + + - name: "Enterprise Publish to S3 Staging Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${ARTIFACTS_KEY} + secret_access_key: ${ARTIFACTS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" skip_cleanup: true acl: private local_dir: artifacts_dir diff --git a/scripts/release.sh b/scripts/release.sh index 74311e0312..f3bc2cdf74 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -4,6 +4,8 @@ set -e # Use full history for release git checkout -B "${TRAVIS_BRANCH}" +git config user.email "build@alfresco.com" + release_type=$1 echo Release type: "$release_type" @@ -15,15 +17,15 @@ elif [ $release_type != "community" -a $release_type != "enterprise" ]; then exit 1 fi -if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; - then echo "Please provide a Release and Development verison" - exit 1 -else - mvn --batch-mode \ +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +mvn --batch-mode \ -Dusername="${GIT_USERNAME}" \ -Dpassword="${GIT_PASSWORD}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${release_type}-release release:clean release:prepare release:perform -fi + -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 0f18168c50..e74c9ca4a3 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash +set -evx echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" -release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') if [ ! -n "$release_message" ]; then echo "The commit message is in the wrong format or it does not contain all the required properties." @@ -12,32 +13,4 @@ export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') echo "Release version is set to $RELEASE_VERSION" -echo "Development version is set to $DEVELOPMENT_VERSION" - -release_type=$(echo $release_message | grep -Po '(internal\s)*(community|enterprise)') - -if [[ $release_type =~ "community" ]]; then - echo "Setting Community Release variables..." - export RELEASE_TYPE="community" - if [[ $release_type =~ "internal" ]]; then - echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" - export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" - export ARTIFACTS_UPLOAD_DIR="community/RM/${RELEASE_VERSION}" - else - echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" - export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" - export ARTIFACTS_UPLOAD_DIR="release/community/RM/${RELEASE_VERSION}" - fi -elif [[ $release_type =~ "enterprise" ]]; then - echo "Setting Enterprise Release variables..." - export RELEASE_TYPE="enterprise" - if [[ $release_type =~ "internal" ]]; then - echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release" - export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging" - export ARTIFACTS_UPLOAD_DIR="enterprise/RM/${RELEASE_VERSION}" - else - echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release" - export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com" - export ARTIFACTS_UPLOAD_DIR="release/enterprise/RM/${RELEASE_VERSION}" - fi -fi \ No newline at end of file +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 60be3bb87e..97204e3925 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -7,5 +7,4 @@ then export MAVEN_PHASE="deploy" else export MAVEN_PHASE="verify" -fi - +fi \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..96a1c14ab3 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -evx + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-*${release_type}*amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-*${release_type}*amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-*${release_type}*war artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls artifacts_dir \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..12c4b246ad --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -evx + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls artifacts_dir \ No newline at end of file diff --git a/scripts/zip-artifacts.sh b/scripts/zip-artifacts.sh deleted file mode 100755 index d81acca46d..0000000000 --- a/scripts/zip-artifacts.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [ $1 == 'community' ]; then - mkdir "artifacts_dir" - cp rm-community/rm-community-repo/target/alfresco-rm-*community*amp artifacts_dir - cp rm-community/rm-community-share/target/alfresco-rm-*community*amp artifacts_dir - cp rm-community/rm-community-rest-api-explorer/target/alfresco-rm-*community*war artifacts_dir - cd artifacts_dir - zip alfresco-rm-community-${RELEASE_VERSION}.zip *amp - ls artifacts_dir -elif [ $1 == "enterprise" ]; then - mkdir "artifacts_dir" - cp rm-enterprise/rm-enterprise-repo/target/alfresco-rm-*enterprise*amp artifacts_dir - cp rm-enterprise/rm-enterprise-share/target/alfresco-rm-*enterprise*amp artifacts_dir - cd artifacts_dir - zip alfresco-rm-enterprise-${RELEASE_VERSION}.zip *amp - ls artifacts_dir -fi From b4dced6d26e31f782ba8188d5504a9040ca98c62 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 15:20:11 +0300 Subject: [PATCH 076/153] Increase heap size for alfresco --- .travis.yml | 2 -- pom.xml | 2 +- travis-env-vars.yml | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2507c556eb..deca5dddc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,6 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml @@ -128,7 +127,6 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - sudo cat /proc/meminfo - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml diff --git a/pom.xml b/pom.xml index 4ec9b44259..5a776be2f8 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ 1.8 UTF-8 UTF-8 - -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote + -Xmx2g -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote true false diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 461c88a038..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,6 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - MAVEN_SKIP_RC=true - - MAVEN_OPTS="-Xms1024m -Xmx2G -noverify" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From c26d2235497ac982e815cb79594387bbf941f71d Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 15:21:24 +0300 Subject: [PATCH 077/153] [enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] [skip tests] From 47f73a13321bf7d0b3a6c8717d6d9b7d47aec3d7 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 12:56:23 +0000 Subject: [PATCH 078/153] [maven-release-plugin] prepare release V2.7.3-A1 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index aae40bdd40..77ca55382a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-SNAPSHOT + 2.7.3-A1 Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V2.7.3-A1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4ba2bd34d1..30dcacf8d5 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A1 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index e3e83a30d8..08d71da424 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-SNAPSHOT + 2.7.3-A1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 98eaca587f..5905629ca8 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0b7c2d62bc..481783a72f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A1 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index d3f6be7580..41bed2c77d 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A1 From afc3b8345e15e5d4e69d2e9c5e8d149d11710d04 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 12:56:31 +0000 Subject: [PATCH 079/153] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 77ca55382a..aae40bdd40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-A1 + 2.7.3-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V2.7.3-A1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 30dcacf8d5..4ba2bd34d1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A1 + 2.7.3-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 08d71da424..e3e83a30d8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-A1 + 2.7.3-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 5905629ca8..98eaca587f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A1 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 481783a72f..0b7c2d62bc 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A1 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 41bed2c77d..d3f6be7580 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A1 + 2.7.3-SNAPSHOT From 6e53b68f0f577a5443edf65dde692ae9f75b5dcc Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 16:45:58 +0300 Subject: [PATCH 080/153] APPS-241: - fix zip-artifacts-release.sh - remove -x flag - add scmCommentPrefix to maven release command [enterprise release 2.7.3-A2 2.7.3-SNAPSHOT] [skip tests] --- scripts/release.sh | 3 ++- scripts/set-release-variables.sh | 2 +- scripts/zip-artifacts-release.sh | 4 ++-- scripts/zip-artifacts-staging.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index f3bc2cdf74..1436d0c8e8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -e +set -ev # Use full history for release git checkout -B "${TRAVIS_BRANCH}" @@ -27,5 +27,6 @@ mvn --batch-mode \ -Dpassword="${GIT_PASSWORD}" \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index e74c9ca4a3..44cce71321 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -evx +set -ev echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh index 96a1c14ab3..41ea2c8d5e 100644 --- a/scripts/zip-artifacts-release.sh +++ b/scripts/zip-artifacts-release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -evx +set -ev release_type=$1 @@ -24,4 +24,4 @@ cd artifacts_dir zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * # rm *.amp *.war -f -ls artifacts_dir \ No newline at end of file +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh index 12c4b246ad..d06da74700 100755 --- a/scripts/zip-artifacts-staging.sh +++ b/scripts/zip-artifacts-staging.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -evx +set -ev release_type=$1 From 0099ddb5d0766ef66765e2523c360a386ace54da Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 17:03:36 +0300 Subject: [PATCH 081/153] set java options for maven --- pom.xml | 2 +- rm-automation/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a776be2f8..4ec9b44259 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ 1.8 UTF-8 UTF-8 - -Xmx2g -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote + -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote true false diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4ba2bd34d1..d5cce3b346 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -51,6 +51,7 @@ maven-surefire-plugin + -Xms1024m -Xmx2G false ${project.build.testOutputDirectory}/${suiteXmlFile} From b5bb8eda19435c1890983e0d1641cfd05afd659d Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 15:07:07 +0000 Subject: [PATCH 082/153] [maven-release-plugin][skip ci] prepare release V2.7.3-A2 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index aae40bdd40..c7c8cd48ed 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-SNAPSHOT + 2.7.3-A2 Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V2.7.3-A2 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4ba2bd34d1..7e5323aa85 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A2 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index e3e83a30d8..cb2393ca31 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-SNAPSHOT + 2.7.3-A2 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 98eaca587f..e0ea78669c 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A2 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0b7c2d62bc..5b56de9ed7 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A2 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index d3f6be7580..cdf2b6d4dd 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A2 From 54c0d941e0209dc0c3913b8008d5ec8cdd53fb86 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 15:07:15 +0000 Subject: [PATCH 083/153] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c7c8cd48ed..aae40bdd40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-A2 + 2.7.3-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V2.7.3-A2 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7e5323aa85..4ba2bd34d1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A2 + 2.7.3-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index cb2393ca31..e3e83a30d8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-A2 + 2.7.3-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index e0ea78669c..98eaca587f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A2 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 5b56de9ed7..0b7c2d62bc 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A2 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index cdf2b6d4dd..d3f6be7580 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A2 + 2.7.3-SNAPSHOT From cac8033166fc4ee056965943f2eea2efe38c3d8a Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 18:21:22 +0300 Subject: [PATCH 084/153] [enterprise release 2.7.3-A3 2.7.3-SNAPSHOT] [skip tests] --- scripts/zip-artifacts-staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh index d06da74700..11bf97cc06 100755 --- a/scripts/zip-artifacts-staging.sh +++ b/scripts/zip-artifacts-staging.sh @@ -12,4 +12,4 @@ cd artifacts_dir zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * # rm *.amp *.war -f -ls artifacts_dir \ No newline at end of file +ls \ No newline at end of file From 436364dc59f956a51e239e972b25abf7c7c88b1f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 20 Oct 2020 19:03:50 +0300 Subject: [PATCH 085/153] change screen resolution for UI jobs that fail constantly with 137 code --- .travis.yml | 4 ++-- rm-automation/pom.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index deca5dddc9..4293ab8b98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ jobs: - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index d5cce3b346..4ba2bd34d1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -51,7 +51,6 @@ maven-surefire-plugin - -Xms1024m -Xmx2G false ${project.build.testOutputDirectory}/${suiteXmlFile} From dbab4daf48acb0b3bd48331fbadd8e85a598c0d0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 06:48:36 +0300 Subject: [PATCH 086/153] test --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4293ab8b98..531244c759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,12 +108,12 @@ jobs: - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1024x768x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From 4ea98fb71314e9bb8d3f451ce560cd48065375e6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 08:39:51 +0300 Subject: [PATCH 087/153] xvfb memory leak workaround --- .travis.yml | 20 ++++++++++---------- travis-env-vars.yml | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 531244c759..18bffeb45f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,17 +103,17 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1280x1024x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -131,37 +131,37 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Security Marks UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Console and Configuration UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 2cc02543db..aec00df72a 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,4 +7,5 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 + - XVFB_ARGS="-screen 0 1920x1080x24 -noreset" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From ed02227789f17095a07afefcd190135cddd4e214 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 08:55:33 +0300 Subject: [PATCH 088/153] set JAVA_OPTIONS --- travis-env-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index aec00df72a..61b98bb023 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,5 @@ env: - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - XVFB_ARGS="-screen 0 1920x1080x24 -noreset" + - _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 97b9b32f05d5a06a74d563a4963528b124517d7a Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 10:09:55 +0300 Subject: [PATCH 089/153] [enterprise release 2.7.3-A3 2.7.3-SNAPSHOT] [skip tests] From d3dea33999595c4a03f11c68bfdc1d5c55de33e8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 10:21:43 +0300 Subject: [PATCH 090/153] try to balance community smoke UI tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18bffeb45f..fdd566d15f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,7 @@ jobs: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - &community_shared_UI_config - name: "Community Smoke UI Tests for In place Records" + name: "Community Smoke UI Tests for Records" stage: Tests addons: firefox: "43.0.1" From 7bd8546d60aa6f5a2bf69a5defbf17814bdfede7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 10:32:04 +0300 Subject: [PATCH 091/153] remove xvfb memory workaround --- .travis.yml | 98 ++++++++++++++++++++++----------------------- travis-env-vars.yml | 2 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdd566d15f..febd49567f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ services: - docker stages: - - name: Build AGS +# - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans @@ -38,54 +38,54 @@ stages: jobs: include: - - name: "Build AGS Community" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Benchmark" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - - name: "Community Rest API Tests" - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Enterprise Rest API Tests" - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml - script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# - name: "Build AGS Community" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Enterprise" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Benchmark" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# script: +# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Community Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Community Integrations Tests on MySQL" +# - name: "Enterprise Integrations Tests on MySQL" +# stage: Tests +# script: +# - echo "Enterprise Integrations Tests on MySQL" +# +# - name: "Community Rest API Tests" +# stage: Tests +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Enterprise Rest API Tests" +# stage: Tests +# before_install: +# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q +# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target +# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml +# script: +# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - &community_shared_UI_config name: "Community Smoke UI Tests for Records" diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 61b98bb023..aee01d35d7 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,6 +7,6 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - XVFB_ARGS="-screen 0 1920x1080x24 -noreset" + - XVFB_ARGS="-screen 0 1920x1080x24" - _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 5dd0fe5f226718ac1da6db716bba125e721a649e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 10:36:36 +0300 Subject: [PATCH 092/153] uncomment job --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index febd49567f..015d0297ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,15 +69,15 @@ jobs: # script: # - echo "Enterprise Integrations Tests on MySQL" # -# - name: "Community Rest API Tests" -# stage: Tests -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# + - name: "Community Rest API Tests" + stage: Tests + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # - name: "Enterprise Rest API Tests" # stage: Tests # before_install: From 980b0263e13a8ed37de2501a4cd09edc3e8cb37f Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 07:37:03 +0000 Subject: [PATCH 093/153] [maven-release-plugin][skip ci] prepare release V2.7.3-A3 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index aae40bdd40..4e593086b8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-SNAPSHOT + 2.7.3-A3 Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V2.7.3-A3 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4ba2bd34d1..7111576aa0 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A3 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index e3e83a30d8..b795256ff8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-SNAPSHOT + 2.7.3-A3 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 98eaca587f..b4f6c59ff5 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A3 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0b7c2d62bc..798f5419b3 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A3 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index d3f6be7580..e931bd404c 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A3 From e07400f440dafe8da14308c6e8e86142777c405b Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 07:37:11 +0000 Subject: [PATCH 094/153] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 4e593086b8..aae40bdd40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-A3 + 2.7.3-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V2.7.3-A3 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7111576aa0..4ba2bd34d1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A3 + 2.7.3-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b795256ff8..e3e83a30d8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-A3 + 2.7.3-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index b4f6c59ff5..98eaca587f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A3 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 798f5419b3..0b7c2d62bc 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A3 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index e931bd404c..d3f6be7580 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A3 + 2.7.3-SNAPSHOT From 7d036c6e6be156298a7bd906c48af80e6c56b512 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 11:53:03 +0300 Subject: [PATCH 095/153] remove java options --- travis-env-vars.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index aee01d35d7..95ef524977 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,5 +8,4 @@ env: - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - XVFB_ARGS="-screen 0 1920x1080x24" - - _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From e7b74cfcdb11efbc130549a07316abb6c6d7d890 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 11:56:54 +0300 Subject: [PATCH 096/153] Revert "remove java options" This reverts commit 7d036c6e --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 95ef524977..e856472d11 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,5 +7,5 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - XVFB_ARGS="-screen 0 1920x1080x24" + - _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From abfd605be132c64082a5f07710ffcaac5c805188 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 11:57:34 +0300 Subject: [PATCH 097/153] do not use XVFB_ARGS variable --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 015d0297ef..a5f048a578 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,17 +103,17 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -131,37 +131,37 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Security Marks UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Console and Configuration UI Tests" script: - - travis_wait 60 xvfb-run --server-args=${XVFB_ARGS} mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans From ac79e0c5dbe2362cecfeb630a35363a06f2475dc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 12:17:14 +0300 Subject: [PATCH 098/153] use JAVA_OPTIONS only for content classification UI tests --- .travis.yml | 2 +- travis-env-vars.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5f048a578..0f15dd4111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" _JAVA_OPTIONS="-Xmx2048m -Xms1024m" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" diff --git a/travis-env-vars.yml b/travis-env-vars.yml index e856472d11..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -7,5 +7,4 @@ env: - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8080/share" - DISPLAY=:99.0 - - _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 07e2bc3f1a16b0272375ba6dbf12fb85334b4f24 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 12:17:25 +0300 Subject: [PATCH 099/153] APPS-241: Update release and staging buckets access credentials - remove -v flag from scripts [enterprise release 2.7.3-A4 2.7.3-SNAPSHOT] [skip tests] --- .travis.yml | 18 +++++++++--------- scripts/release.sh | 2 +- scripts/set-release-variables.sh | 2 +- scripts/zip-artifacts-release.sh | 2 +- scripts/zip-artifacts-staging.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9eba90c3d..63483d490c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,8 +122,8 @@ jobs: - bash scripts/zip-artifacts-staging.sh "community" deploy: - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} region: "eu-west-1" bucket: "alfresco-artefacts-staging" upload_dir: "community/RM/${RELEASE_VERSION}" @@ -146,8 +146,8 @@ jobs: - bash scripts/zip-artifacts-staging.sh "enterprise" deploy: - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} region: "eu-west-1" bucket: "alfresco-artefacts-staging" upload_dir: "enterprise/RM/${RELEASE_VERSION}" @@ -167,8 +167,8 @@ jobs: before_deploy: bash scripts/zip-artifacts-release.sh "community" deploy: - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} region: "eu-west-1" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -180,7 +180,7 @@ jobs: after_deploy: - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" - - name: "Enterprise Publish to S3 Staging Bucket" + - name: "Enterprise Publish to S3 Release Bucket" stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh @@ -188,8 +188,8 @@ jobs: before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" deploy: - provider: s3 - access_key_id: ${ARTIFACTS_KEY} - secret_access_key: ${ARTIFACTS_SECRET} + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} region: "eu-west-1" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" diff --git a/scripts/release.sh b/scripts/release.sh index 1436d0c8e8..e49e7bc202 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ev +set -e # Use full history for release git checkout -B "${TRAVIS_BRANCH}" diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 44cce71321..35013b7053 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ev +set -e echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh index 41ea2c8d5e..81d272a4ca 100644 --- a/scripts/zip-artifacts-release.sh +++ b/scripts/zip-artifacts-release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ev +set -e release_type=$1 diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh index 11bf97cc06..bada0395ae 100755 --- a/scripts/zip-artifacts-staging.sh +++ b/scripts/zip-artifacts-staging.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ev +set -e release_type=$1 From 955d68a63b223cba0c7e82554903979c00cc2b5d Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 12:18:37 +0300 Subject: [PATCH 100/153] [enterprise release 2.7.3-A4 2.7.3-SNAPSHOT] [skip tests] From e64ec9d5387a903bd7c13ee566d3a559f46ff182 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 12:43:22 +0300 Subject: [PATCH 101/153] remove _JAVA_OPTIONS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f15dd4111..a5f048a578 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" _JAVA_OPTIONS="-Xmx2048m -Xms1024m" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From 9e760bc79bc5bef0c0b3a4c1d1867a444694523d Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 10:00:22 +0000 Subject: [PATCH 102/153] [maven-release-plugin][skip ci] prepare release V2.7.3-A4 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index aae40bdd40..ffc6a2c0a9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-SNAPSHOT + 2.7.3-A4 Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V2.7.3-A4 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4ba2bd34d1..7b3e0f8490 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A4 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index e3e83a30d8..b952faf94a 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-SNAPSHOT + 2.7.3-A4 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 98eaca587f..bfe673c84f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-SNAPSHOT + 2.7.3-A4 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0b7c2d62bc..cd8812bfd7 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A4 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index d3f6be7580..9eb9880895 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-SNAPSHOT + 2.7.3-A4 From 411ef66a9fd31089c4beecc995036b08a2287ffe Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 10:00:30 +0000 Subject: [PATCH 103/153] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ffc6a2c0a9..aae40bdd40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.7.3-A4 + 2.7.3-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V2.7.3-A4 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7b3e0f8490..4ba2bd34d1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A4 + 2.7.3-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b952faf94a..e3e83a30d8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 2.7.3-A4 + 2.7.3-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index bfe673c84f..98eaca587f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.7.3-A4 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index cd8812bfd7..0b7c2d62bc 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A4 + 2.7.3-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 9eb9880895..d3f6be7580 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 2.7.3-A4 + 2.7.3-SNAPSHOT From 317852b469a5622b7c5e2b5b98069153010faf50 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 13:40:52 +0300 Subject: [PATCH 104/153] APPS-241: Update release message with the correct artifacts upload location [skip tests] --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63483d490c..c7eab62c53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,7 +133,7 @@ jobs: on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" - name: "Enterprise Release and Publish to S3 Staging Bucket" stage: Release @@ -157,7 +157,7 @@ jobs: on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" - name: "Community Publish to S3 Release Bucket" stage: Publish @@ -178,8 +178,7 @@ jobs: on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" - + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" - name: "Enterprise Publish to S3 Release Bucket" stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ @@ -199,4 +198,4 @@ jobs: on: all_branches: true after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}" \ No newline at end of file + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" \ No newline at end of file From 3785f83928ad7764ed993d519671df4995da2b83 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 13:41:23 +0300 Subject: [PATCH 105/153] [skip tests] From de6ea603223dc6794a9655463ba65b284eb1a79a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 14:24:17 +0300 Subject: [PATCH 106/153] re-balance community smoke UI tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5f048a578..08915b5f5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From 2d0a32d3e016a4befac42b4664fccee1965dc705 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 14:37:19 +0300 Subject: [PATCH 107/153] APPS-241: Remove changes required by testing [skip tests] --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7eab62c53..cd6abc32cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release - if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish - if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ #TODO + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: From b66b5017f71f67f0a8b32d5de9458f3c0d0eb2f8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 21 Oct 2020 17:23:30 +0300 Subject: [PATCH 108/153] uncomment build stage --- .travis.yml | 98 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08915b5f5d..5430a0a7fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ services: - docker stages: -# - name: Build AGS + - name: Build AGS - name: Tests if: commit_message !~ /\[skip tests\]/ - name: Security Scans @@ -38,37 +38,37 @@ stages: jobs: include: -# - name: "Build AGS Community" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Enterprise" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Benchmark" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# script: -# - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Community Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Community Integrations Tests on MySQL" -# - name: "Enterprise Integrations Tests on MySQL" -# stage: Tests -# script: -# - echo "Enterprise Integrations Tests on MySQL" -# + - name: "Build AGS Community" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Enterprise" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Benchmark" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" stage: Tests before_install: @@ -78,14 +78,14 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# - name: "Enterprise Rest API Tests" -# stage: Tests -# before_install: -# - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q -# - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target -# install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -# script: -# - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise Rest API Tests" + stage: Tests + before_install: + - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml + script: + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - &community_shared_UI_config name: "Community Smoke UI Tests for Records" @@ -103,17 +103,17 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Smoke UI Tests for actions in RM site" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *community_shared_UI_config name: "Community Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" @@ -131,12 +131,12 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" @@ -146,22 +146,22 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Guides UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Security Marks UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Console and Configuration UI Tests" script: - - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans From 520181c22761507a606762f7fb75223c1e8301e0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 10:02:49 +0300 Subject: [PATCH 109/153] rename suite --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5430a0a7fc..f00c172225 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ jobs: script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - &community_shared_UI_config + - &community_shared_UI_configuration name: "Community Smoke UI Tests for Records" stage: Tests addons: @@ -103,14 +103,14 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeInPlaceRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - <<: *community_shared_UI_config + - <<: *community_shared_UI_configuration name: "Community Smoke UI Tests for actions in RM site" script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - <<: *community_shared_UI_config + - <<: *community_shared_UI_configuration name: "Community Level 2 UI Tests" script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From 06fcdcdf8e4d20848235fb48f8a7d66264dbf009 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 10:03:21 +0300 Subject: [PATCH 110/153] Merge pull request #1250 from Alfresco/feature-2.7/APPS-238_RunUITests_no Feature 2.7/apps 238 run ui tests no # Conflicts: # travis-env-vars.yml --- .travis.yml | 71 ++++++++++++++++++++++++++++++++++++++++++--- travis-env-vars.yml | 4 +++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca7fb54e2c..3ba59ecbb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,7 @@ jobs: stage: Tests script: - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" stage: Tests before_install: @@ -77,6 +78,7 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise Rest API Tests" stage: Tests before_install: @@ -85,22 +87,83 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community UI Tests ..." + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Content Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Guides UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 3da82d46bb..3684a7d0fb 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -5,3 +5,7 @@ env: - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_COMMUNITY_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.3-build-00012/alfresco-content-services-installer-5.2.3-linux-x64.bin + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8080/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 9c8af9f670f9fae6a4224c6a119c9ae31e8b2082 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 10:03:21 +0300 Subject: [PATCH 111/153] Merge pull request #1250 from Alfresco/feature-2.7/APPS-238_RunUITests_no Feature 2.7/apps 238 run ui tests no --- .travis.yml | 71 ++++++++++++++++++++++++++++++++++++++++++--- travis-env-vars.yml | 4 +++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index aed8a6a880..b17ad8b9ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,7 @@ jobs: stage: Tests script: - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" stage: Tests before_install: @@ -76,6 +77,7 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise Rest API Tests" stage: Tests before_install: @@ -84,22 +86,83 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community UI Tests ..." + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Content Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Guides UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/travis-env-vars.yml b/travis-env-vars.yml index cb6c4b75d6..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,3 +4,7 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8080/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From f4758604326f3b3563406d92010af085be87cd4b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 10:03:21 +0300 Subject: [PATCH 112/153] Merge pull request #1250 from Alfresco/feature-2.7/APPS-238_RunUITests_no Feature 2.7/apps 238 run ui tests no --- .travis.yml | 71 ++++++++++++++++++++++++++++++++++++++++++--- travis-env-vars.yml | 4 +++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index aed8a6a880..b17ad8b9ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,7 @@ jobs: stage: Tests script: - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" stage: Tests before_install: @@ -76,6 +77,7 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise Rest API Tests" stage: Tests before_install: @@ -84,22 +86,83 @@ jobs: install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community UI Tests ..." + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - - echo "Enterprise UI Tests ..." + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Content Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Guides UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/travis-env-vars.yml b/travis-env-vars.yml index cb6c4b75d6..2cc02543db 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,3 +4,7 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8080/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' From 93c24dc94a6f33dfe7ef79ea118d273bc9869392 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 22 Oct 2020 11:32:02 +0300 Subject: [PATCH 113/153] - tidy up the travis file [skip tests] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2d785c9415..e1d2c83088 100644 --- a/.travis.yml +++ b/.travis.yml @@ -242,6 +242,7 @@ jobs: all_branches: true after_deploy: - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + - name: "Enterprise Publish to S3 Release Bucket" stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ From d6799537597464dd07ee26a1ee51bc50ced2fa14 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Wed, 29 Jan 2020 09:46:04 +0200 Subject: [PATCH 114/153] move the cmis query tests add some additional usecase (cherry picked from commit c20cfb3c6ffcb5ef82c58e61e006627723cf1aed) (cherry picked from commit a18c22155fd1a7d79f38f7db7cbc78d42489ff11) --- .../rm/community/search/CmisQueryTests.java | 218 ++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java new file mode 100644 index 0000000000..53795fce3f --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -0,0 +1,218 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2020 Alfresco Software Limited + * %% + * License rights for this program may be obtained from Alfresco Software, Ltd. + * pursuant to a written agreement and any use of this program without such an + * agreement is prohibited. + * #L% + */ + +package org.alfresco.rest.rm.community.search; + +import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_MANAGER; +import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix; +import static org.alfresco.utility.report.log.Step.STEP; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import org.alfresco.dataprep.ContentActions; +import org.alfresco.rest.rm.community.base.BaseRMRestTest; +import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild; +import org.alfresco.rest.rm.community.model.user.UserPermissions; +import org.alfresco.test.AlfrescoTest; +import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; +import org.apache.chemistry.opencmis.client.api.ItemIterable; +import org.apache.chemistry.opencmis.client.api.OperationContext; +import org.apache.chemistry.opencmis.client.api.QueryResult; +import org.apache.chemistry.opencmis.client.runtime.OperationContextImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** + * Test to check that RM doesn't break CMIS query + * + * @author jcule, Rodica Sutu + * @since 2.5.4 + * @since 3.3 + */ +public class CmisQueryTests extends BaseRMRestTest +{ + private static final String SEARCH_TERM = generateTestPrefix(CmisQueryTests.class); + private static final String sqlWithName = + "SELECT cmis:name FROM cmis:document where CONTAINS('cmis:name:*" + SEARCH_TERM + "*')"; + + private SiteModel collaborationSite; + private UserModel nonRMUser, rmUser; + private RecordCategoryChild recordFolder; + + @Autowired + private ContentActions contentActions; + + /** + * Create some test data: + *
+     *     - a collaboration site with documents
+     *     - in place records
+     *     - category with folder and records
+     *     - a user with no rm rights (no rights to see the record from file plan)
+     *     - a user with rights to see the records and the other documents created
+     * 
+ */ + @BeforeClass (alwaysRun = true) + public void setupCmisQuery() throws Exception + { + STEP("Create a collaboration site"); + collaborationSite = dataSite.usingAdmin().createPrivateRandomSite(); + + STEP("Create 10 documents ending with SEARCH_TERM"); + for (int i = 0; ++i <= 10; ) + { + FileModel fileModel = new FileModel(String.format("%s.%s", "Doc" + i + SEARCH_TERM, + FileType.TEXT_PLAIN.extention)); + dataContent.usingAdmin().usingSite(collaborationSite).createContent(fileModel); + } + + STEP("Create a collaborator user for the collaboration site"); + nonRMUser = getDataUser().createRandomTestUser(); + getDataUser().addUserToSite(nonRMUser, collaborationSite, UserRole.SiteManager); + + STEP("Create 10 documents and declare as records"); + for (int i = 0; ++i <= 10; ) + { + FileModel fileModel = new FileModel(String.format("%s.%s", "InPlace " + SEARCH_TERM + i, + FileType.TEXT_PLAIN.extention)); + fileModel = dataContent.usingUser(nonRMUser).usingSite(collaborationSite).createContent(fileModel); + getRestAPIFactory().getFilesAPI(nonRMUser).declareAsRecord(fileModel.getNodeRefWithoutVersion()); + } + + STEP("Create record folder and some records "); + recordFolder = createCategoryFolderInFilePlan(); + for (int i = 0; ++i <= 10; ) + { + createElectronicRecord(recordFolder.getId(), "Record " + SEARCH_TERM + i); + } + STEP("Create an rm user with read permission over the category created and contributor role within the " + + "collaboration site"); + rmUser = getDataUser().createRandomTestUser(); + getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER); + getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getParentId(), rmUser, UserPermissions.PERMISSION_READ_RECORDS); + getDataUser().addUserToSite(rmUser, collaborationSite, UserRole.SiteContributor); + + + //do a cmis query to wait for solr indexing + long currentTime = System.currentTimeMillis(); + long endTime = 0; + do + { + try + { + endTime = System.currentTimeMillis(); + ItemIterable results = contentActions.getCMISSession(getAdminUser().getUsername(), + getAdminUser().getPassword()).query(sqlWithName, false); + assertEquals("Total number of items is not 30, got " + results.getTotalNumItems() + "total items", + 30, results.getTotalNumItems()); + break; + } + catch (AssertionError | Exception e) + { + if (endTime - currentTime > 30000) + { + throw new AssertionError("Maximum retry period reached, test failed.", e); + } + Thread.sleep(5000); + } + } while (true); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names
+     * Then I get all documents names 100 per page
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getAllDocumentsNamesCmisQuery() + { + // execute the cmis query + String cq = "SELECT cmis:name FROM cmis:document"; + ItemIterable results = + contentActions.getCMISSession(getAdminUser().getUsername(), getAdminUser().getPassword()).query(cq, + false); + + // check the total number of items is greater than 100 and has more items is true + assertTrue("Has more items not true.", results.getHasMoreItems()); + assertTrue("Total number of items is not greater than 100. Total number of items received" + results.getTotalNumItems(), + results.getTotalNumItems() > 100); + assertEquals("Expected 100 items per page and got " + results.getPageNumItems() + " per page.", 100, + results.getPageNumItems()); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names with a particular name
+     * Then I get all documents names user has permission
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getDocumentsWithSpecificNamesCmisQuery() throws Exception + { + // execute the cmis query + ItemIterable results = + contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(sqlWithName, + false); + assertEquals("Total number of items is not 20, got " + results.getTotalNumItems() + " total items", + 20, results.getTotalNumItems()); + // check the has more items is false + assertFalse("Has more items not false.", results.getHasMoreItems()); + assertEquals("Expected 20 items per page and got " + results.getPageNumItems() + " per page.", 20, + results.getPageNumItems()); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names with a specific number per page
+     * Then I get all documents names paged as requested that the user has permission
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getDocumentsCmisQueryWithPagination() throws Exception + { + OperationContext oc = new OperationContextImpl(); + oc.setMaxItemsPerPage(10); + ItemIterable results = + contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(sqlWithName, + false, oc); + + // check the total number of items and has more items is true + assertTrue("Has more items not true. ", results.getHasMoreItems()); + assertEquals("Total number of items is not 30 " + results.getTotalNumItems(), 30, + results.getTotalNumItems()); + assertEquals("Expected 10 items per page and got " + results.getPageNumItems() + " per page.", + 10, results.getPageNumItems()); + } + + @AfterClass + private void clearCmisQueryTests() + { + dataSite.usingAdmin().deleteSite(collaborationSite); + getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(recordFolder.getParentId()); + getDataUser().usingAdmin().deleteUser(rmUser); + getDataUser().usingAdmin().deleteUser(nonRMUser); + } +} From c5e3fa99c865fbb936cac64182c61bef6fbcbded Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Wed, 29 Jan 2020 09:46:04 +0200 Subject: [PATCH 115/153] move the cmis query tests add some additional usecase (cherry picked from commit c20cfb3c6ffcb5ef82c58e61e006627723cf1aed) (cherry picked from commit a18c22155fd1a7d79f38f7db7cbc78d42489ff11) --- .../rm/community/search/CmisQueryTests.java | 218 ++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java new file mode 100644 index 0000000000..53795fce3f --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -0,0 +1,218 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2020 Alfresco Software Limited + * %% + * License rights for this program may be obtained from Alfresco Software, Ltd. + * pursuant to a written agreement and any use of this program without such an + * agreement is prohibited. + * #L% + */ + +package org.alfresco.rest.rm.community.search; + +import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_MANAGER; +import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix; +import static org.alfresco.utility.report.log.Step.STEP; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import org.alfresco.dataprep.ContentActions; +import org.alfresco.rest.rm.community.base.BaseRMRestTest; +import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild; +import org.alfresco.rest.rm.community.model.user.UserPermissions; +import org.alfresco.test.AlfrescoTest; +import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; +import org.apache.chemistry.opencmis.client.api.ItemIterable; +import org.apache.chemistry.opencmis.client.api.OperationContext; +import org.apache.chemistry.opencmis.client.api.QueryResult; +import org.apache.chemistry.opencmis.client.runtime.OperationContextImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** + * Test to check that RM doesn't break CMIS query + * + * @author jcule, Rodica Sutu + * @since 2.5.4 + * @since 3.3 + */ +public class CmisQueryTests extends BaseRMRestTest +{ + private static final String SEARCH_TERM = generateTestPrefix(CmisQueryTests.class); + private static final String sqlWithName = + "SELECT cmis:name FROM cmis:document where CONTAINS('cmis:name:*" + SEARCH_TERM + "*')"; + + private SiteModel collaborationSite; + private UserModel nonRMUser, rmUser; + private RecordCategoryChild recordFolder; + + @Autowired + private ContentActions contentActions; + + /** + * Create some test data: + *
+     *     - a collaboration site with documents
+     *     - in place records
+     *     - category with folder and records
+     *     - a user with no rm rights (no rights to see the record from file plan)
+     *     - a user with rights to see the records and the other documents created
+     * 
+ */ + @BeforeClass (alwaysRun = true) + public void setupCmisQuery() throws Exception + { + STEP("Create a collaboration site"); + collaborationSite = dataSite.usingAdmin().createPrivateRandomSite(); + + STEP("Create 10 documents ending with SEARCH_TERM"); + for (int i = 0; ++i <= 10; ) + { + FileModel fileModel = new FileModel(String.format("%s.%s", "Doc" + i + SEARCH_TERM, + FileType.TEXT_PLAIN.extention)); + dataContent.usingAdmin().usingSite(collaborationSite).createContent(fileModel); + } + + STEP("Create a collaborator user for the collaboration site"); + nonRMUser = getDataUser().createRandomTestUser(); + getDataUser().addUserToSite(nonRMUser, collaborationSite, UserRole.SiteManager); + + STEP("Create 10 documents and declare as records"); + for (int i = 0; ++i <= 10; ) + { + FileModel fileModel = new FileModel(String.format("%s.%s", "InPlace " + SEARCH_TERM + i, + FileType.TEXT_PLAIN.extention)); + fileModel = dataContent.usingUser(nonRMUser).usingSite(collaborationSite).createContent(fileModel); + getRestAPIFactory().getFilesAPI(nonRMUser).declareAsRecord(fileModel.getNodeRefWithoutVersion()); + } + + STEP("Create record folder and some records "); + recordFolder = createCategoryFolderInFilePlan(); + for (int i = 0; ++i <= 10; ) + { + createElectronicRecord(recordFolder.getId(), "Record " + SEARCH_TERM + i); + } + STEP("Create an rm user with read permission over the category created and contributor role within the " + + "collaboration site"); + rmUser = getDataUser().createRandomTestUser(); + getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER); + getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getParentId(), rmUser, UserPermissions.PERMISSION_READ_RECORDS); + getDataUser().addUserToSite(rmUser, collaborationSite, UserRole.SiteContributor); + + + //do a cmis query to wait for solr indexing + long currentTime = System.currentTimeMillis(); + long endTime = 0; + do + { + try + { + endTime = System.currentTimeMillis(); + ItemIterable results = contentActions.getCMISSession(getAdminUser().getUsername(), + getAdminUser().getPassword()).query(sqlWithName, false); + assertEquals("Total number of items is not 30, got " + results.getTotalNumItems() + "total items", + 30, results.getTotalNumItems()); + break; + } + catch (AssertionError | Exception e) + { + if (endTime - currentTime > 30000) + { + throw new AssertionError("Maximum retry period reached, test failed.", e); + } + Thread.sleep(5000); + } + } while (true); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names
+     * Then I get all documents names 100 per page
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getAllDocumentsNamesCmisQuery() + { + // execute the cmis query + String cq = "SELECT cmis:name FROM cmis:document"; + ItemIterable results = + contentActions.getCMISSession(getAdminUser().getUsername(), getAdminUser().getPassword()).query(cq, + false); + + // check the total number of items is greater than 100 and has more items is true + assertTrue("Has more items not true.", results.getHasMoreItems()); + assertTrue("Total number of items is not greater than 100. Total number of items received" + results.getTotalNumItems(), + results.getTotalNumItems() > 100); + assertEquals("Expected 100 items per page and got " + results.getPageNumItems() + " per page.", 100, + results.getPageNumItems()); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names with a particular name
+     * Then I get all documents names user has permission
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getDocumentsWithSpecificNamesCmisQuery() throws Exception + { + // execute the cmis query + ItemIterable results = + contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(sqlWithName, + false); + assertEquals("Total number of items is not 20, got " + results.getTotalNumItems() + " total items", + 20, results.getTotalNumItems()); + // check the has more items is false + assertFalse("Has more items not false.", results.getHasMoreItems()); + assertEquals("Expected 20 items per page and got " + results.getPageNumItems() + " per page.", 20, + results.getPageNumItems()); + } + + /** + *
+     * Given the RM site created
+     * When I execute a cmis query to get all the documents names with a specific number per page
+     * Then I get all documents names paged as requested that the user has permission
+     * 
+ */ + @Test + @AlfrescoTest (jira = "MNT-19442") + public void getDocumentsCmisQueryWithPagination() throws Exception + { + OperationContext oc = new OperationContextImpl(); + oc.setMaxItemsPerPage(10); + ItemIterable results = + contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(sqlWithName, + false, oc); + + // check the total number of items and has more items is true + assertTrue("Has more items not true. ", results.getHasMoreItems()); + assertEquals("Total number of items is not 30 " + results.getTotalNumItems(), 30, + results.getTotalNumItems()); + assertEquals("Expected 10 items per page and got " + results.getPageNumItems() + " per page.", + 10, results.getPageNumItems()); + } + + @AfterClass + private void clearCmisQueryTests() + { + dataSite.usingAdmin().deleteSite(collaborationSite); + getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(recordFolder.getParentId()); + getDataUser().usingAdmin().deleteUser(rmUser); + getDataUser().usingAdmin().deleteUser(nonRMUser); + } +} From 5c8ac1598f41b85a17a657fd3d3cd6644e7db9dd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 09:40:46 +0300 Subject: [PATCH 116/153] fix header (cherry picked from commit 278699f1837015f25fed2d5ba8e264cd1ab2b393) --- .../rm/community/search/CmisQueryTests.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index 53795fce3f..33c83389ad 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -4,9 +4,24 @@ * %% * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% - * License rights for this program may be obtained from Alfresco Software, Ltd. - * pursuant to a written agreement and any use of this program without such an - * agreement is prohibited. + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . * #L% */ From 169d4d40430efdbd59d556806cb2a08f9bc6aab2 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 09:40:46 +0300 Subject: [PATCH 117/153] fix header (cherry picked from commit 278699f1837015f25fed2d5ba8e264cd1ab2b393) --- .../rm/community/search/CmisQueryTests.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index 53795fce3f..33c83389ad 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -4,9 +4,24 @@ * %% * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% - * License rights for this program may be obtained from Alfresco Software, Ltd. - * pursuant to a written agreement and any use of this program without such an - * agreement is prohibited. + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . * #L% */ From 1104f2bf5ccc53ab0bd9c1c0ad4e465777d5b8fb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 16:26:03 +0300 Subject: [PATCH 118/153] fix the parameter (cherry picked from commit d3206cf36326fecddea596ebc94131ee99810d1f) --- .../org/alfresco/rest/rm/community/search/CmisQueryTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index 33c83389ad..d4bf440e9b 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -119,7 +119,7 @@ public class CmisQueryTests extends BaseRMRestTest STEP("Create an rm user with read permission over the category created and contributor role within the " + "collaboration site"); rmUser = getDataUser().createRandomTestUser(); - getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER); + getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER.roleId); getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getParentId(), rmUser, UserPermissions.PERMISSION_READ_RECORDS); getDataUser().addUserToSite(rmUser, collaborationSite, UserRole.SiteContributor); From c86ce78d007a61701d9144009e99ee75c6cb3e6d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 14:51:02 +0300 Subject: [PATCH 119/153] code review comments (cherry picked from commit 604fc7785e4fa78a92743a55f115883167b3ddc3) --- .../alfresco/rest/rm/community/search/CmisQueryTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index d4bf440e9b..8624e2d00f 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -63,7 +63,7 @@ import org.testng.annotations.Test; public class CmisQueryTests extends BaseRMRestTest { private static final String SEARCH_TERM = generateTestPrefix(CmisQueryTests.class); - private static final String sqlWithName = + private static final String SQL_WITH_NAME = "SELECT cmis:name FROM cmis:document where CONTAINS('cmis:name:*" + SEARCH_TERM + "*')"; private SiteModel collaborationSite; @@ -133,7 +133,7 @@ public class CmisQueryTests extends BaseRMRestTest { endTime = System.currentTimeMillis(); ItemIterable results = contentActions.getCMISSession(getAdminUser().getUsername(), - getAdminUser().getPassword()).query(sqlWithName, false); + getAdminUser().getPassword()).query(SQL_WITH_NAME, false); assertEquals("Total number of items is not 30, got " + results.getTotalNumItems() + "total items", 30, results.getTotalNumItems()); break; @@ -187,7 +187,7 @@ public class CmisQueryTests extends BaseRMRestTest { // execute the cmis query ItemIterable results = - contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(sqlWithName, + contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(SQL_WITH_NAME, false); assertEquals("Total number of items is not 20, got " + results.getTotalNumItems() + " total items", 20, results.getTotalNumItems()); @@ -211,7 +211,7 @@ public class CmisQueryTests extends BaseRMRestTest OperationContext oc = new OperationContextImpl(); oc.setMaxItemsPerPage(10); ItemIterable results = - contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(sqlWithName, + contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(SQL_WITH_NAME, false, oc); // check the total number of items and has more items is true From fa44d00d9c646130db7fc2ecd8d9f3dbcdf7da6a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 14:51:02 +0300 Subject: [PATCH 120/153] code review comments (cherry picked from commit 604fc7785e4fa78a92743a55f115883167b3ddc3) --- .../alfresco/rest/rm/community/search/CmisQueryTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index 33c83389ad..8be8ff293d 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -63,7 +63,7 @@ import org.testng.annotations.Test; public class CmisQueryTests extends BaseRMRestTest { private static final String SEARCH_TERM = generateTestPrefix(CmisQueryTests.class); - private static final String sqlWithName = + private static final String SQL_WITH_NAME = "SELECT cmis:name FROM cmis:document where CONTAINS('cmis:name:*" + SEARCH_TERM + "*')"; private SiteModel collaborationSite; @@ -133,7 +133,7 @@ public class CmisQueryTests extends BaseRMRestTest { endTime = System.currentTimeMillis(); ItemIterable results = contentActions.getCMISSession(getAdminUser().getUsername(), - getAdminUser().getPassword()).query(sqlWithName, false); + getAdminUser().getPassword()).query(SQL_WITH_NAME, false); assertEquals("Total number of items is not 30, got " + results.getTotalNumItems() + "total items", 30, results.getTotalNumItems()); break; @@ -187,7 +187,7 @@ public class CmisQueryTests extends BaseRMRestTest { // execute the cmis query ItemIterable results = - contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(sqlWithName, + contentActions.getCMISSession(nonRMUser.getUsername(), nonRMUser.getPassword()).query(SQL_WITH_NAME, false); assertEquals("Total number of items is not 20, got " + results.getTotalNumItems() + " total items", 20, results.getTotalNumItems()); @@ -211,7 +211,7 @@ public class CmisQueryTests extends BaseRMRestTest OperationContext oc = new OperationContextImpl(); oc.setMaxItemsPerPage(10); ItemIterable results = - contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(sqlWithName, + contentActions.getCMISSession(rmUser.getUsername(), rmUser.getPassword()).query(SQL_WITH_NAME, false, oc); // check the total number of items and has more items is true From bdc20c068a66718a595b6fa31f0efc64215d7bc6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 3 Apr 2020 16:26:03 +0300 Subject: [PATCH 121/153] fix the parameter (cherry picked from commit d3206cf36326fecddea596ebc94131ee99810d1f) --- .../org/alfresco/rest/rm/community/search/CmisQueryTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java index 8be8ff293d..8624e2d00f 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java @@ -119,7 +119,7 @@ public class CmisQueryTests extends BaseRMRestTest STEP("Create an rm user with read permission over the category created and contributor role within the " + "collaboration site"); rmUser = getDataUser().createRandomTestUser(); - getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER); + getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_MANAGER.roleId); getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getParentId(), rmUser, UserPermissions.PERMISSION_READ_RECORDS); getDataUser().addUserToSite(rmUser, collaborationSite, UserRole.SiteContributor); From 5c653eec3a6a9de918ba2f15dcc2653ce5c8c96e Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 22 Oct 2020 13:25:17 +0300 Subject: [PATCH 122/153] - address PR review comments [skip tests] --- scripts/zip-artifacts-release.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh index 81d272a4ca..c8690dac21 100644 --- a/scripts/zip-artifacts-release.sh +++ b/scripts/zip-artifacts-release.sh @@ -4,9 +4,6 @@ set -e release_type=$1 mkdir "artifacts_dir" -cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-*${release_type}*amp artifacts_dir -cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-*${release_type}*amp artifacts_dir -cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-*${release_type}*war artifacts_dir mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ From 2fe98b2571c656a79e8bd1e5cc7f2b37a40e1c7e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 13:46:09 +0300 Subject: [PATCH 123/153] increase travis wait time --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ba59ecbb1..91443209be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,7 +142,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 120 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From e0d42393fad532f9d741ce87a3e95e074a90e402 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 13:46:09 +0300 Subject: [PATCH 124/153] increase travis wait time --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b17ad8b9ad..4d3b1fe653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 120 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From 3f534aaaad17c2272fc25fde1a093c0af7aa0522 Mon Sep 17 00:00:00 2001 From: Elena Hardon Date: Thu, 22 Oct 2020 14:08:05 +0300 Subject: [PATCH 125/153] Merge pull request #1246 from Alfresco/merge-2.7/APPS-241_addCoReleaseStage_merge2.7_no APPS-241: Create Community and Enterprise Release and Publish Stages --- .travis.yml | 96 +++++++++++++++++++++++++++++--- README.md | 1 + pom.xml | 6 +- scripts/release.sh | 32 +++++++++++ scripts/set-release-variables.sh | 16 ++++++ scripts/setUpMavenPhase.sh | 3 +- scripts/zip-artifacts-release.sh | 24 ++++++++ scripts/zip-artifacts-staging.sh | 15 +++++ 8 files changed, 179 insertions(+), 14 deletions(-) create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/.travis.yml b/.travis.yml index ca7fb54e2c..e13c925569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -110,16 +112,92 @@ jobs: script: - echo "Static Analysis (SAST)" - - name: "Community Release" + - name: "Community Release and Publish to S3 Staging Bucket" stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" - - name: "Copy to S3 Release Bucket" - stage: Publish + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Copy to S3 Release Bucket" + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" + + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" \ No newline at end of file diff --git a/README.md b/README.md index 1ec3fe91f5..9134fc277d 100644 --- a/README.md +++ b/README.md @@ -138,3 +138,4 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using solr start -a "-Dcreate.alfresco.defaults=alfresco,archive" ``` Start your repository + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6fb8bb2735..4cfdd9049c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..e49e7bc202 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + -DskipTests -D${release_type} -DuseReleaseProfile=false \ + -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 60be3bb87e..97204e3925 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -7,5 +7,4 @@ then export MAVEN_PHASE="deploy" else export MAVEN_PHASE="verify" -fi - +fi \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file From fdad228b552c5c58968b550d025002a4c8ed12cf Mon Sep 17 00:00:00 2001 From: Elena Hardon Date: Thu, 22 Oct 2020 14:08:05 +0300 Subject: [PATCH 126/153] Merge pull request #1246 from Alfresco/merge-2.7/APPS-241_addCoReleaseStage_merge2.7_no APPS-241: Create Community and Enterprise Release and Publish Stages --- .travis.yml | 96 +++++++++++++++++++++++++++++--- README.md | 1 + pom.xml | 6 +- scripts/release.sh | 32 +++++++++++ scripts/set-release-variables.sh | 16 ++++++ scripts/setUpMavenPhase.sh | 3 +- scripts/zip-artifacts-release.sh | 24 ++++++++ scripts/zip-artifacts-staging.sh | 15 +++++ 8 files changed, 179 insertions(+), 14 deletions(-) create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/.travis.yml b/.travis.yml index aed8a6a880..5861df9ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -109,16 +111,92 @@ jobs: script: - echo "Static Analysis (SAST)" - - name: "Community Release" + - name: "Community Release and Publish to S3 Staging Bucket" stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" - - name: "Copy to S3 Release Bucket" - stage: Publish + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Copy to S3 Release Bucket" + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" + + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" \ No newline at end of file diff --git a/README.md b/README.md index 1ec3fe91f5..9134fc277d 100644 --- a/README.md +++ b/README.md @@ -138,3 +138,4 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using solr start -a "-Dcreate.alfresco.defaults=alfresco,archive" ``` Start your repository + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 12987bbf2e..b82c8eaff6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..e49e7bc202 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + -DskipTests -D${release_type} -DuseReleaseProfile=false \ + -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 60be3bb87e..97204e3925 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -7,5 +7,4 @@ then export MAVEN_PHASE="deploy" else export MAVEN_PHASE="verify" -fi - +fi \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file From 5e5324f7a243d542609672b0df3bbf751644863b Mon Sep 17 00:00:00 2001 From: Elena Hardon Date: Thu, 22 Oct 2020 14:08:05 +0300 Subject: [PATCH 127/153] Merge pull request #1246 from Alfresco/merge-2.7/APPS-241_addCoReleaseStage_merge2.7_no APPS-241: Create Community and Enterprise Release and Publish Stages --- .travis.yml | 96 +++++++++++++++++++++++++++++--- README.md | 1 + pom.xml | 6 +- scripts/release.sh | 32 +++++++++++ scripts/set-release-variables.sh | 16 ++++++ scripts/setUpMavenPhase.sh | 3 +- scripts/zip-artifacts-release.sh | 24 ++++++++ scripts/zip-artifacts-staging.sh | 15 +++++ 8 files changed, 179 insertions(+), 14 deletions(-) create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/.travis.yml b/.travis.yml index aed8a6a880..5861df9ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -109,16 +111,92 @@ jobs: script: - echo "Static Analysis (SAST)" - - name: "Community Release" + - name: "Community Release and Publish to S3 Staging Bucket" stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" - - name: "Copy to S3 Release Bucket" - stage: Publish + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh script: - - echo "Copy to S3 Release Bucket" + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" + + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" \ No newline at end of file diff --git a/README.md b/README.md index 1ec3fe91f5..9134fc277d 100644 --- a/README.md +++ b/README.md @@ -138,3 +138,4 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using solr start -a "-Dcreate.alfresco.defaults=alfresco,archive" ``` Start your repository + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c81fceaf63..1438bba142 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..e49e7bc202 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + -DskipTests -D${release_type} -DuseReleaseProfile=false \ + -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 60be3bb87e..97204e3925 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -7,5 +7,4 @@ then export MAVEN_PHASE="deploy" else export MAVEN_PHASE="verify" -fi - +fi \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file From 783581efcbc8bf186f0b66d5b4fa87645f4bdb18 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 22 Oct 2020 13:46:09 +0300 Subject: [PATCH 128/153] increase travis wait time --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b17ad8b9ad..4d3b1fe653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ jobs: - <<: *enterprise_shared_UI_configuration name: "Enterprise Content Classification UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 120 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" From 4b7ab6057ff90ae488dfc391b7a0f4bf907a0efb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 23 Oct 2020 10:28:09 +0300 Subject: [PATCH 129/153] build rm-automation-ui in before_install --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6d5b121b6a..0551dc447c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh @@ -135,6 +136,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh From 95ac547ba19a9bf988f741f4e304e9bd83e692cd Mon Sep 17 00:00:00 2001 From: cagache Date: Fri, 12 Apr 2019 14:32:52 +0300 Subject: [PATCH 130/153] Renamed test classes to end with Test or Tests (cherry picked from commit ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a) --- .../audit/{AuditLoginEvents.java => AuditLoginEventsTests.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/{AuditLoginEvents.java => AuditLoginEventsTests.java} (98%) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java index 462d3dc235..f82ef396f6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java @@ -48,7 +48,7 @@ import org.testng.annotations.Test; * @since 2.7 */ @AlfrescoTest (jira = "RM-5234") -public class AuditLoginEvents extends BaseRMRestTest +public class AuditLoginEventsTests extends BaseRMRestTest { @Autowired private RMAuditAPI rmAuditAPI; From 2a71748955dc4c0580f95cc95c5db31089faa8b3 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 25 Oct 2020 13:26:26 +0200 Subject: [PATCH 131/153] rebalance suites --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0551dc447c..9c842090b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,9 +149,9 @@ jobs: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration - name: "Enterprise Content Classification UI Tests" + name: "Enterprise Records Classification UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseContentClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Folders Classification UI Tests" @@ -159,9 +159,9 @@ jobs: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration - name: "Enterprise Guides UI Tests" + name: "Enterprise Documents Classification UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseGuidesTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration name: "Enterprise Security Marks UI Tests" @@ -169,9 +169,9 @@ jobs: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - <<: *enterprise_shared_UI_configuration - name: "Enterprise Console and Configuration UI Tests" + name: "Enterprise Console, Guides and Configuration UI Tests" script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleAndConfigurationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - name: "Source Clear Scan (SCA)" stage: Security Scans From a4ecc29002736077a517e54b86603682ae901af7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 08:41:17 +0200 Subject: [PATCH 132/153] execute community UI tests on enterprise environment if the branch doesn't contain in its name community keyword --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c842090b8..79e3d84c60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,6 +93,7 @@ jobs: script: - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + - &community_shared_UI_configuration name: "Community Smoke UI Tests for Records" stage: Tests @@ -105,10 +106,20 @@ jobs: - ./rm-automation/rm-automation-ui/target/screenshots target_paths: $TRAVIS_BUILD_NUMBER before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + - | + if [[ ${TRAVIS_BRANCH} == *community* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + fi - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + - | + if [[ ${TRAVIS_BRANCH} == *community* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + fi - bash scripts/waitForAlfrescoToStart.sh script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From eb19b151689330d99d678f06100cdd86b7d724f4 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 26 Oct 2020 08:58:29 +0200 Subject: [PATCH 133/153] - push docker images to quay when doing shelf releases --- .travis.yml | 4 ++++ scripts/check-existing-tags.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 scripts/check-existing-tags.sh diff --git a/.travis.yml b/.travis.yml index 79e3d84c60..b5542072fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -198,10 +198,12 @@ jobs: if: commit_message =~ /\[community release .*\]/ before_script: - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" script: - bash scripts/release.sh "community" before_deploy: - bash scripts/zip-artifacts-staging.sh "community" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} deploy: - provider: s3 access_key_id: ${STAGING_AWS_ACCESS_KEY} @@ -222,10 +224,12 @@ jobs: if: commit_message =~ /\[enterprise release .*\]/ before_script: - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-enterprise" script: - bash scripts/release.sh "enterprise" before_deploy: - bash scripts/zip-artifacts-staging.sh "enterprise" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} deploy: - provider: s3 access_key_id: ${STAGING_AWS_ACCESS_KEY} diff --git a/scripts/check-existing-tags.sh b/scripts/check-existing-tags.sh new file mode 100644 index 0000000000..dee1edabc3 --- /dev/null +++ b/scripts/check-existing-tags.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +alfresco_docker_image=$1 +# Verify release tags +get_tags="$(curl https://hub.docker.com/r/$alfresco_docker_image/tags/ | grep -o '\"result\".*\"]')" +arrayTags=($get_tags) + +echo "Existing Tags: $get_tags" + +for tag in "${arrayTags[@]}" +do + if [[ $tag = ${RELEASE_VERSION} ]]; then + echo "Tag ${RELEASE_VERSION} already pushed, release process will interrupt." + exit 0 + fi +done + +echo "The ${RELEASE_VERSION} tag was not found" From 3f7bd575435792fd26e4c016e1a43f83f701660c Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 26 Oct 2020 10:30:26 +0200 Subject: [PATCH 134/153] - remove dockerhub image publishing profile from shelf release script --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index e49e7bc202..73843ab320 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -29,4 +29,4 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file + release:clean release:prepare release:perform \ No newline at end of file From fff4aba2f2ae0716f823b43b769571a0dff90675 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 26 Oct 2020 10:33:15 +0200 Subject: [PATCH 135/153] - revert release script changes --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 73843ab320..e49e7bc202 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -29,4 +29,4 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - release:clean release:prepare release:perform \ No newline at end of file + -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file From 94d9836b89ff4099cb536894620d15bcb88e2317 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 11:26:00 +0200 Subject: [PATCH 136/153] changed approach to run community tests on enterprise env --- .travis.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5542072fb..bf3a9c9cf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,16 +74,27 @@ jobs: - name: "Community Rest API Tests" stage: Tests install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + fi - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + fi - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests + if: commit_message !~ /\[tests on community\]/ install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am @@ -107,7 +118,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | - if [[ ${TRAVIS_BRANCH} == *community* ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am @@ -115,7 +126,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - | - if [[ ${TRAVIS_BRANCH} == *community* ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH @@ -137,6 +148,7 @@ jobs: - &enterprise_shared_UI_configuration name: "Enterprise Level 2 UI Tests" stage: Tests + if: commit_message !~ /\[tests on community\]/ addons: firefox: "43.0.1" artifacts: From a9b13be9995869c475f338da5f892936cef81ce4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 12:35:34 +0200 Subject: [PATCH 137/153] fix condition --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf3a9c9cf6..e9e8a76f80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ jobs: stage: Tests install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am @@ -83,7 +83,8 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am before_script: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + echo ${TRAVIS_COMMIT_MESSAGE} + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH @@ -118,7 +119,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am @@ -126,7 +127,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH From 7748cfa4f2df5b0f430ef1c32fa58da25421738f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 13:28:54 +0200 Subject: [PATCH 138/153] try to fix the regex --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9e8a76f80..b8ee4ff1cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,8 @@ jobs: stage: Tests install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then + echo ${TRAVIS_COMMIT_MESSAGE} + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am @@ -83,8 +84,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am before_script: - | - echo ${TRAVIS_COMMIT_MESSAGE} - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH @@ -119,7 +119,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am @@ -127,7 +127,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ /\[tests on community\]/ ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH From e0823765f8548f963b87f2aee98cbfa5464e0572 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 15:54:55 +0300 Subject: [PATCH 139/153] fix containers names (cherry picked from commit 75ef68181656ddc4f7f3098c46671e0837c39363) --- .travis.yml | 4 +++- scripts/dockerLimitMemory.sh | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 scripts/dockerLimitMemory.sh diff --git a/.travis.yml b/.travis.yml index b8ee4ff1cc..696f97e315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis-env-vars.yml -os: linux dist: xenial +sudo: required language: java jdk: - openjdk11 @@ -164,6 +164,8 @@ jobs: install: - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..b77c9c5764 --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +set -x + +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1.5Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_transform-router_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_tika_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_activemq_' | awk '{print $1}') + +# Display containers resources usage after limitation +docker stats --no-stream From 6b4b66d04bc310297ab9d78d29dfe9188deacbd7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 11 Oct 2020 11:10:07 +0300 Subject: [PATCH 140/153] remove not needed containers --- scripts/dockerLimitMemory.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index b77c9c5764..be9ca3fd48 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,17 +5,15 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=1.5Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_transform-router_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_tika_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') -docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_activemq_' | awk '{print $1}') + +#stop not needed container +docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') # Display containers resources usage after limitation docker stats --no-stream From 2f5f410af8621407b374ad671ef81f4356dfa0d8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 14:25:05 +0200 Subject: [PATCH 141/153] limit share memory --- scripts/dockerLimitMemory.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index be9ca3fd48..c9c6527983 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -12,6 +12,10 @@ docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagic docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId +fi #stop not needed container docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') From 239b12a220136a1ce991f5a02ab783cbb3fe3720 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 14:30:33 +0200 Subject: [PATCH 142/153] check [tests on community] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 696f97e315..289b23d67e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,6 +119,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | + echo ${TRAVIS_COMMIT_MESSAGE} if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else From 6245b0d4fbedacacba80adce4b9ce6cd40ddb155 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 15:15:11 +0200 Subject: [PATCH 143/153] test again [tests on community] --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 289b23d67e..5a44e7a05f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,7 @@ jobs: stage: Tests install: - | - echo ${TRAVIS_COMMIT_MESSAGE} - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am @@ -84,7 +83,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am before_script: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH @@ -119,8 +118,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | - echo ${TRAVIS_COMMIT_MESSAGE} - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am @@ -128,7 +126,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH From d8aed515c78cc35c15528bfa031abe1622cc151f Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 27 Oct 2020 08:42:08 +0200 Subject: [PATCH 144/153] - set the correct deploymentRepository for the release.sh - update the release command --- .travis.yml | 5 ++--- scripts/release.sh | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8ee4ff1cc..5ccfec6d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -237,7 +237,6 @@ jobs: if: commit_message =~ /\[enterprise release .*\]/ before_script: - source scripts/set-release-variables.sh - - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-enterprise" script: - bash scripts/release.sh "enterprise" before_deploy: @@ -262,7 +261,7 @@ jobs: stage: Publish if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: skip + script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-community before_deploy: bash scripts/zip-artifacts-release.sh "community" deploy: - provider: s3 @@ -283,7 +282,7 @@ jobs: stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: skip + script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-enterprise before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" deploy: - provider: s3 diff --git a/scripts/release.sh b/scripts/release.sh index e49e7bc202..ea5ee113de 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -17,6 +17,14 @@ elif [ $release_type != "community" -a $release_type != "enterprise" ]; then exit 1 fi +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ]; +then + deploymentRepository="hotfix-release" +else + deploymentRepository="${release_type}-release" +fi + if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" exit 1 @@ -29,4 +37,4 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file + -P${deploymentRepository} release:clean release:prepare release:perform \ No newline at end of file From bee12c401dd6e35cd99f3e30eab0dbc26c203c6d Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 27 Oct 2020 10:53:12 +0200 Subject: [PATCH 145/153] - update the release command to push the docker images to quay and dockerhub --- .travis.yml | 4 ++-- scripts/release.sh | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7bab353be..e0de76312d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -262,7 +262,7 @@ jobs: stage: Publish if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-community + script: skip before_deploy: bash scripts/zip-artifacts-release.sh "community" deploy: - provider: s3 @@ -283,7 +283,7 @@ jobs: stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-enterprise + script: skip before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" deploy: - provider: s3 diff --git a/scripts/release.sh b/scripts/release.sh index ea5ee113de..600dd51deb 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -17,19 +17,19 @@ elif [ $release_type != "community" -a $release_type != "enterprise" ]; then exit 1 fi -# Check if it's a hotfix version by counting the number of dots in the version number. -if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ]; -then - deploymentRepository="hotfix-release" -else - deploymentRepository="${release_type}-release" -fi - if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" exit 1 fi +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ]; +then + deployment_repository="hotfix-release" +else + deployment_repository="${release_type}-release" +fi + mvn --batch-mode \ -Dusername="${GIT_USERNAME}" \ -Dpassword="${GIT_PASSWORD}" \ @@ -37,4 +37,5 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${deploymentRepository} release:clean release:prepare release:perform \ No newline at end of file + -P${deployment_repository} -Prelease-${release_type} \ + release:clean release:prepare release:perform \ No newline at end of file From 95441c2a8d183d19f43c3a72233a6d7201e6a709 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 27 Oct 2020 10:57:53 +0200 Subject: [PATCH 146/153] - update the release command to push the docker images to quay using the internal profile --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 600dd51deb..f56577ce44 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -37,5 +37,5 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${deployment_repository} -Prelease-${release_type} \ + -P${deployment_repository} -Pinternal \ release:clean release:prepare release:perform \ No newline at end of file From e2cc4ad126caf08e4c81b26265c69fe1e2b5d2ea Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 27 Oct 2020 17:16:56 +0200 Subject: [PATCH 147/153] - fix release command --- scripts/release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index f56577ce44..dddaad246c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -23,7 +23,7 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then fi # Check if it's a hotfix version by counting the number of dots in the version number. -if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ]; +if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; then deployment_repository="hotfix-release" else @@ -36,6 +36,5 @@ mvn --batch-mode \ -DreleaseVersion=${RELEASE_VERSION} \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ - -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${deployment_repository} -Pinternal \ + "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \ release:clean release:prepare release:perform \ No newline at end of file From 32be57e94cbffe64cf1d3e2ce74528a8175e4a05 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 29 Oct 2020 09:05:12 +0200 Subject: [PATCH 148/153] split the logic in multiple travis files --- travis-env-vars.yml => .travis.env-vars.yml | 0 .travis.publish-stage.yml | 43 ++++ .travis.release-stage.yml | 52 +++++ .travis.tests-stage.yml | 137 ++++++++++++ .travis.yml | 234 +------------------- 5 files changed, 236 insertions(+), 230 deletions(-) rename travis-env-vars.yml => .travis.env-vars.yml (100%) create mode 100644 .travis.publish-stage.yml create mode 100644 .travis.release-stage.yml create mode 100644 .travis.tests-stage.yml diff --git a/travis-env-vars.yml b/.travis.env-vars.yml similarity index 100% rename from travis-env-vars.yml rename to .travis.env-vars.yml diff --git a/.travis.publish-stage.yml b/.travis.publish-stage.yml new file mode 100644 index 0000000000..fdb32962c4 --- /dev/null +++ b/.travis.publish-stage.yml @@ -0,0 +1,43 @@ +jobs: + include: + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.release-stage.yml b/.travis.release-stage.yml new file mode 100644 index 0000000000..acdf93a64a --- /dev/null +++ b/.travis.release-stage.yml @@ -0,0 +1,52 @@ +jobs: + include: + - name: "Community Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" + script: + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml new file mode 100644 index 0000000000..7a20d80d9a --- /dev/null +++ b/.travis.tests-stage.yml @@ -0,0 +1,137 @@ +jobs: + include: + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + + - name: "Community Rest API Tests" + stage: Tests + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am + before_script: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - name: "Enterprise Rest API Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Records Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Documents Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console, Guides and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/.travis.yml b/.travis.yml index e0de76312d..91b1a7704f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ import: - - source: travis-env-vars.yml + - source: .travis.env-vars.yml + - source: .travis.tests-stage.yml + - source: .travis.release-stage.yml + - source: .travis.publish-stage.yml dist: xenial sudo: required language: java @@ -62,142 +65,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - - name: "Community Rest API Tests" - stage: Tests - install: - - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am - else - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - fi - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am - before_script: - - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - else - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - fi - - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - - name: "Enterprise Rest API Tests" - stage: Tests - if: commit_message !~ /\[tests on community\]/ - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - - &community_shared_UI_configuration - name: "Community Smoke UI Tests for Records" - stage: Tests - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am - else - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am - fi - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am - install: - - | - if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - else - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - fi - - bash scripts/waitForAlfrescoToStart.sh - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *community_shared_UI_configuration - name: "Community Smoke UI Tests for actions in RM site" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *community_shared_UI_configuration - name: "Community Level 2 UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - &enterprise_shared_UI_configuration - name: "Enterprise Level 2 UI Tests" - stage: Tests - if: commit_message !~ /\[tests on community\]/ - addons: - firefox: "43.0.1" - artifacts: - paths: - - ./rm-automation/rm-automation-ui/target/surefire-reports - - ./rm-automation/rm-automation-ui/target/reports - - ./rm-automation/rm-automation-ui/target/screenshots - target_paths: $TRAVIS_BUILD_NUMBER - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - - bash scripts/dockerLimitMemory.sh - - sudo free -m -t - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Classification Level 2 UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Records Classification UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Folders Classification UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Documents Classification UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Security Marks UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - - <<: *enterprise_shared_UI_configuration - name: "Enterprise Console, Guides and Configuration UI Tests" - script: - - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - - name: "Source Clear Scan (SCA)" stage: Security Scans script: @@ -206,96 +73,3 @@ jobs: stage: Security Scans script: - echo "Static Analysis (SAST)" - - - name: "Community Release and Publish to S3 Staging Bucket" - stage: Release - if: commit_message =~ /\[community release .*\]/ - before_script: - - source scripts/set-release-variables.sh - - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" - script: - - bash scripts/release.sh "community" - before_deploy: - - bash scripts/zip-artifacts-staging.sh "community" - - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} - deploy: - - provider: s3 - access_key_id: ${STAGING_AWS_ACCESS_KEY} - secret_access_key: ${STAGING_AWS_SECRET_KEY} - region: "eu-west-1" - bucket: "alfresco-artefacts-staging" - upload_dir: "community/RM/${RELEASE_VERSION}" - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" - - - name: "Enterprise Release and Publish to S3 Staging Bucket" - stage: Release - if: commit_message =~ /\[enterprise release .*\]/ - before_script: - - source scripts/set-release-variables.sh - script: - - bash scripts/release.sh "enterprise" - before_deploy: - - bash scripts/zip-artifacts-staging.sh "enterprise" - - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} - deploy: - - provider: s3 - access_key_id: ${STAGING_AWS_ACCESS_KEY} - secret_access_key: ${STAGING_AWS_SECRET_KEY} - region: "eu-west-1" - bucket: "alfresco-artefacts-staging" - upload_dir: "enterprise/RM/${RELEASE_VERSION}" - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" - - - name: "Community Publish to S3 Release Bucket" - stage: Publish - if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ - before_script: source scripts/set-release-variables.sh - script: skip - before_deploy: bash scripts/zip-artifacts-release.sh "community" - deploy: - - provider: s3 - access_key_id: ${RELEASE_AWS_ACCESS_KEY} - secret_access_key: $RELEASE_AWS_ACCESS_SECRET} - region: "eu-west-1" - bucket: "eu.dl.alfresco.com" - upload_dir: "release/community/RM/${RELEASE_VERSION}" - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" - - - name: "Enterprise Publish to S3 Release Bucket" - stage: Publish - if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ - before_script: source scripts/set-release-variables.sh - script: skip - before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" - deploy: - - provider: s3 - access_key_id: ${RELEASE_AWS_ACCESS_KEY} - secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} - region: "eu-west-1" - bucket: "eu.dl.alfresco.com" - upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" - skip_cleanup: true - acl: private - local_dir: artifacts_dir - on: - all_branches: true - after_deploy: - - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" From 693b3f6e3834aad4d2cfda3fccd81333a65672cf Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 29 Oct 2020 12:27:56 +0200 Subject: [PATCH 149/153] - add dockerhub and quay login steps --- scripts/release.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/release.sh b/scripts/release.sh index dddaad246c..4435342437 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -22,6 +22,10 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then exit 1 fi +# Docker Logins +echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin +echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io + # Check if it's a hotfix version by counting the number of dots in the version number. if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; then From 8b1194f4abebb2d47df496d100dc9f2666243f39 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 29 Oct 2020 20:48:26 +0200 Subject: [PATCH 150/153] Merge pull request #1262 from Alfresco/merge-3.0/APPS-238_APPS-104_no Merge 3.0/apps 238 apps 104 no --- travis-env-vars.yml => .travis.env-vars.yml | 4 + .travis.publish-stage.yml | 43 ++++++ .travis.release-stage.yml | 52 +++++++ .travis.tests-stage.yml | 137 ++++++++++++++++++ .travis.yml | 71 +-------- pom.xml | 6 +- ...Events.java => AuditLoginEventsTests.java} | 2 +- scripts/check-existing-tags.sh | 18 +++ scripts/dockerLimitMemory.sh | 23 +++ scripts/release.sh | 44 ++++++ scripts/set-release-variables.sh | 16 ++ scripts/zip-artifacts-release.sh | 24 +++ scripts/zip-artifacts-staging.sh | 15 ++ 13 files changed, 387 insertions(+), 68 deletions(-) rename travis-env-vars.yml => .travis.env-vars.yml (66%) create mode 100644 .travis.publish-stage.yml create mode 100644 .travis.release-stage.yml create mode 100644 .travis.tests-stage.yml rename rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/{AuditLoginEvents.java => AuditLoginEventsTests.java} (98%) create mode 100644 scripts/check-existing-tags.sh create mode 100644 scripts/dockerLimitMemory.sh create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/travis-env-vars.yml b/.travis.env-vars.yml similarity index 66% rename from travis-env-vars.yml rename to .travis.env-vars.yml index aa0e1f1190..016c5bc889 100644 --- a/travis-env-vars.yml +++ b/.travis.env-vars.yml @@ -8,3 +8,7 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8181/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' diff --git a/.travis.publish-stage.yml b/.travis.publish-stage.yml new file mode 100644 index 0000000000..fdb32962c4 --- /dev/null +++ b/.travis.publish-stage.yml @@ -0,0 +1,43 @@ +jobs: + include: + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.release-stage.yml b/.travis.release-stage.yml new file mode 100644 index 0000000000..acdf93a64a --- /dev/null +++ b/.travis.release-stage.yml @@ -0,0 +1,52 @@ +jobs: + include: + - name: "Community Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" + script: + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml new file mode 100644 index 0000000000..7a20d80d9a --- /dev/null +++ b/.travis.tests-stage.yml @@ -0,0 +1,137 @@ +jobs: + include: + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + + - name: "Community Rest API Tests" + stage: Tests + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am + before_script: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - name: "Enterprise Rest API Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Records Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Documents Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console, Guides and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/.travis.yml b/.travis.yml index 416caed1fc..b21ccbc3f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ import: - - source: travis-env-vars.yml -os: linux + - source: .travis.env-vars.yml + - source: .travis.tests-stage.yml + - source: .travis.release-stage.yml + - source: .travis.publish-stage.yml dist: xenial +sudo: required language: java jdk: - openjdk8 @@ -34,7 +37,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -60,54 +65,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Enterprise Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Community UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am - install: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" stage: Security Scans script: @@ -116,17 +73,3 @@ jobs: stage: Security Scans script: - echo "Static Analysis (SAST)" - - - name: "Community Release" - stage: Release - script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" - - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" diff --git a/pom.xml b/pom.xml index bf2f01bbc1..4258888f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java index 462d3dc235..f82ef396f6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java @@ -48,7 +48,7 @@ import org.testng.annotations.Test; * @since 2.7 */ @AlfrescoTest (jira = "RM-5234") -public class AuditLoginEvents extends BaseRMRestTest +public class AuditLoginEventsTests extends BaseRMRestTest { @Autowired private RMAuditAPI rmAuditAPI; diff --git a/scripts/check-existing-tags.sh b/scripts/check-existing-tags.sh new file mode 100644 index 0000000000..dee1edabc3 --- /dev/null +++ b/scripts/check-existing-tags.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +alfresco_docker_image=$1 +# Verify release tags +get_tags="$(curl https://hub.docker.com/r/$alfresco_docker_image/tags/ | grep -o '\"result\".*\"]')" +arrayTags=($get_tags) + +echo "Existing Tags: $get_tags" + +for tag in "${arrayTags[@]}" +do + if [[ $tag = ${RELEASE_VERSION} ]]; then + echo "Tag ${RELEASE_VERSION} already pushed, release process will interrupt." + exit 0 + fi +done + +echo "The ${RELEASE_VERSION} tag was not found" diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..c9c6527983 --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -x + +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') + +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId +fi +#stop not needed container +docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') + +# Display containers resources usage after limitation +docker stats --no-stream diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..4435342437 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +# Docker Logins +echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin +echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io + +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; +then + deployment_repository="hotfix-release" +else + deployment_repository="${release_type}-release" +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \ + release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file From bd65acc42c4c072fff157ed5c234af6f71a460a4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 29 Oct 2020 20:48:26 +0200 Subject: [PATCH 151/153] Merge pull request #1262 from Alfresco/merge-3.0/APPS-238_APPS-104_no Merge 3.0/apps 238 apps 104 no --- travis-env-vars.yml => .travis.env-vars.yml | 4 + .travis.publish-stage.yml | 43 ++++++ .travis.release-stage.yml | 52 +++++++ .travis.tests-stage.yml | 137 ++++++++++++++++++ .travis.yml | 71 +-------- pom.xml | 6 +- ...Events.java => AuditLoginEventsTests.java} | 2 +- scripts/check-existing-tags.sh | 18 +++ scripts/dockerLimitMemory.sh | 23 +++ scripts/release.sh | 44 ++++++ scripts/set-release-variables.sh | 16 ++ scripts/zip-artifacts-release.sh | 24 +++ scripts/zip-artifacts-staging.sh | 15 ++ 13 files changed, 387 insertions(+), 68 deletions(-) rename travis-env-vars.yml => .travis.env-vars.yml (66%) create mode 100644 .travis.publish-stage.yml create mode 100644 .travis.release-stage.yml create mode 100644 .travis.tests-stage.yml rename rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/{AuditLoginEvents.java => AuditLoginEventsTests.java} (98%) create mode 100644 scripts/check-existing-tags.sh create mode 100644 scripts/dockerLimitMemory.sh create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/travis-env-vars.yml b/.travis.env-vars.yml similarity index 66% rename from travis-env-vars.yml rename to .travis.env-vars.yml index aa0e1f1190..016c5bc889 100644 --- a/travis-env-vars.yml +++ b/.travis.env-vars.yml @@ -8,3 +8,7 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8181/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' diff --git a/.travis.publish-stage.yml b/.travis.publish-stage.yml new file mode 100644 index 0000000000..fdb32962c4 --- /dev/null +++ b/.travis.publish-stage.yml @@ -0,0 +1,43 @@ +jobs: + include: + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.release-stage.yml b/.travis.release-stage.yml new file mode 100644 index 0000000000..acdf93a64a --- /dev/null +++ b/.travis.release-stage.yml @@ -0,0 +1,52 @@ +jobs: + include: + - name: "Community Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" + script: + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml new file mode 100644 index 0000000000..7a20d80d9a --- /dev/null +++ b/.travis.tests-stage.yml @@ -0,0 +1,137 @@ +jobs: + include: + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + + - name: "Community Rest API Tests" + stage: Tests + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am + before_script: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - name: "Enterprise Rest API Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Records Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Documents Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console, Guides and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/.travis.yml b/.travis.yml index 6b8f43fad1..91b1a7704f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ import: - - source: travis-env-vars.yml -os: linux + - source: .travis.env-vars.yml + - source: .travis.tests-stage.yml + - source: .travis.release-stage.yml + - source: .travis.publish-stage.yml dist: xenial +sudo: required language: java jdk: - openjdk11 @@ -34,7 +37,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -60,54 +65,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Enterprise Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Community UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am - install: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" stage: Security Scans script: @@ -116,17 +73,3 @@ jobs: stage: Security Scans script: - echo "Static Analysis (SAST)" - - - name: "Community Release" - stage: Release - script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" - - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" diff --git a/pom.xml b/pom.xml index ee19f1a78f..35e263fbfb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java index 462d3dc235..f82ef396f6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java @@ -48,7 +48,7 @@ import org.testng.annotations.Test; * @since 2.7 */ @AlfrescoTest (jira = "RM-5234") -public class AuditLoginEvents extends BaseRMRestTest +public class AuditLoginEventsTests extends BaseRMRestTest { @Autowired private RMAuditAPI rmAuditAPI; diff --git a/scripts/check-existing-tags.sh b/scripts/check-existing-tags.sh new file mode 100644 index 0000000000..dee1edabc3 --- /dev/null +++ b/scripts/check-existing-tags.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +alfresco_docker_image=$1 +# Verify release tags +get_tags="$(curl https://hub.docker.com/r/$alfresco_docker_image/tags/ | grep -o '\"result\".*\"]')" +arrayTags=($get_tags) + +echo "Existing Tags: $get_tags" + +for tag in "${arrayTags[@]}" +do + if [[ $tag = ${RELEASE_VERSION} ]]; then + echo "Tag ${RELEASE_VERSION} already pushed, release process will interrupt." + exit 0 + fi +done + +echo "The ${RELEASE_VERSION} tag was not found" diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..c9c6527983 --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -x + +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') + +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId +fi +#stop not needed container +docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') + +# Display containers resources usage after limitation +docker stats --no-stream diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..4435342437 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +# Docker Logins +echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin +echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io + +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; +then + deployment_repository="hotfix-release" +else + deployment_repository="${release_type}-release" +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \ + release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file From 11e282a3fa45cfab4300821e942ecc87a5f64868 Mon Sep 17 00:00:00 2001 From: cagache Date: Wed, 10 Apr 2019 17:47:48 +0300 Subject: [PATCH 152/153] Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException (cherry picked from commit 6a54f42ea6c1f53d999e1de5e887e67dd336832c) --- .../search/{ShareLiveSearch.java => ShareLiveSearchTests.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/{ShareLiveSearch.java => ShareLiveSearchTests.java} (97%) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java similarity index 97% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java index 75e9669fd3..8716283cfd 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java @@ -38,7 +38,7 @@ import org.alfresco.test.AlfrescoTest; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; -public class ShareLiveSearch extends BaseRMRestTest +public class ShareLiveSearchTests extends BaseRMRestTest { @Autowired SearchAPI searchApi; From 9ff6af4ca236962ad8e85543e682c50ae134e862 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 29 Oct 2020 20:48:26 +0200 Subject: [PATCH 153/153] Merge pull request #1262 from Alfresco/merge-3.0/APPS-238_APPS-104_no Merge 3.0/apps 238 apps 104 no --- travis-env-vars.yml => .travis.env-vars.yml | 4 + .travis.publish-stage.yml | 43 ++++++ .travis.release-stage.yml | 52 +++++++ .travis.tests-stage.yml | 137 ++++++++++++++++++ .travis.yml | 71 +-------- pom.xml | 6 +- ...Events.java => AuditLoginEventsTests.java} | 2 +- scripts/check-existing-tags.sh | 18 +++ scripts/dockerLimitMemory.sh | 23 +++ scripts/release.sh | 44 ++++++ scripts/set-release-variables.sh | 16 ++ scripts/zip-artifacts-release.sh | 24 +++ scripts/zip-artifacts-staging.sh | 15 ++ 13 files changed, 387 insertions(+), 68 deletions(-) rename travis-env-vars.yml => .travis.env-vars.yml (66%) create mode 100644 .travis.publish-stage.yml create mode 100644 .travis.release-stage.yml create mode 100644 .travis.tests-stage.yml rename rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/{AuditLoginEvents.java => AuditLoginEventsTests.java} (98%) create mode 100644 scripts/check-existing-tags.sh create mode 100644 scripts/dockerLimitMemory.sh create mode 100755 scripts/release.sh create mode 100755 scripts/set-release-variables.sh create mode 100644 scripts/zip-artifacts-release.sh create mode 100755 scripts/zip-artifacts-staging.sh diff --git a/travis-env-vars.yml b/.travis.env-vars.yml similarity index 66% rename from travis-env-vars.yml rename to .travis.env-vars.yml index aa0e1f1190..016c5bc889 100644 --- a/travis-env-vars.yml +++ b/.travis.env-vars.yml @@ -8,3 +8,7 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8181/share" + - DISPLAY=:99.0 + - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' diff --git a/.travis.publish-stage.yml b/.travis.publish-stage.yml new file mode 100644 index 0000000000..fdb32962c4 --- /dev/null +++ b/.travis.publish-stage.yml @@ -0,0 +1,43 @@ +jobs: + include: + - name: "Community Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "community" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: $RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Publish to S3 Release Bucket" + stage: Publish + if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ + before_script: source scripts/set-release-variables.sh + script: skip + before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" + deploy: + - provider: s3 + access_key_id: ${RELEASE_AWS_ACCESS_KEY} + secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} + region: "eu-west-1" + bucket: "eu.dl.alfresco.com" + upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.release-stage.yml b/.travis.release-stage.yml new file mode 100644 index 0000000000..acdf93a64a --- /dev/null +++ b/.travis.release-stage.yml @@ -0,0 +1,52 @@ +jobs: + include: + - name: "Community Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[community release .*\]/ + before_script: + - source scripts/set-release-variables.sh + - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community" + script: + - bash scripts/release.sh "community" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "community" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "community/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}" + + - name: "Enterprise Release and Publish to S3 Staging Bucket" + stage: Release + if: commit_message =~ /\[enterprise release .*\]/ + before_script: + - source scripts/set-release-variables.sh + script: + - bash scripts/release.sh "enterprise" + before_deploy: + - bash scripts/zip-artifacts-staging.sh "enterprise" + - bash scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION} + deploy: + - provider: s3 + access_key_id: ${STAGING_AWS_ACCESS_KEY} + secret_access_key: ${STAGING_AWS_SECRET_KEY} + region: "eu-west-1" + bucket: "alfresco-artefacts-staging" + upload_dir: "enterprise/RM/${RELEASE_VERSION}" + skip_cleanup: true + acl: private + local_dir: artifacts_dir + on: + all_branches: true + after_deploy: + - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}" diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml new file mode 100644 index 0000000000..7a20d80d9a --- /dev/null +++ b/.travis.tests-stage.yml @@ -0,0 +1,137 @@ +jobs: + include: + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + + - name: "Community Rest API Tests" + stage: Tests + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am + before_script: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - name: "Enterprise Rest API Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + + - &community_shared_UI_configuration + name: "Community Smoke UI Tests for Records" + stage: Tests + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + else + travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + fi + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - | + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + else + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + fi + - bash scripts/waitForAlfrescoToStart.sh + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Smoke UI Tests for actions in RM site" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRMSite.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *community_shared_UI_configuration + name: "Community Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - &enterprise_shared_UI_configuration + name: "Enterprise Level 2 UI Tests" + stage: Tests + if: commit_message !~ /\[tests on community\]/ + addons: + firefox: "43.0.1" + artifacts: + paths: + - ./rm-automation/rm-automation-ui/target/surefire-reports + - ./rm-automation/rm-automation-ui/target/reports + - ./rm-automation/rm-automation-ui/target/screenshots + target_paths: $TRAVIS_BUILD_NUMBER + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am + install: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Classification Level 2 UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2ClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Records Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseRecordsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Folders Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseFoldersClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Documents Classification UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseDocumentsClassificationTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Security Marks UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseSecurityMarksTests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} + + - <<: *enterprise_shared_UI_configuration + name: "Enterprise Console, Guides and Configuration UI Tests" + script: + - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseConsoleGuidesAndConfiguration.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/.travis.yml b/.travis.yml index 416caed1fc..b21ccbc3f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ import: - - source: travis-env-vars.yml -os: linux + - source: .travis.env-vars.yml + - source: .travis.tests-stage.yml + - source: .travis.release-stage.yml + - source: .travis.publish-stage.yml dist: xenial +sudo: required language: java jdk: - openjdk8 @@ -34,7 +37,9 @@ stages: if: commit_message !~ /\[skip tests\]/ - name: Security Scans - name: Release + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/ - name: Publish + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[publish\]/ jobs: include: @@ -60,54 +65,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-rm-automation-community-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Enterprise Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Community UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am - install: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" stage: Security Scans script: @@ -116,17 +73,3 @@ jobs: stage: Security Scans script: - echo "Static Analysis (SAST)" - - - name: "Community Release" - stage: Release - script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" - - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" diff --git a/pom.xml b/pom.xml index 6af8ebe90c..a8112af457 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java index 462d3dc235..f82ef396f6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java @@ -48,7 +48,7 @@ import org.testng.annotations.Test; * @since 2.7 */ @AlfrescoTest (jira = "RM-5234") -public class AuditLoginEvents extends BaseRMRestTest +public class AuditLoginEventsTests extends BaseRMRestTest { @Autowired private RMAuditAPI rmAuditAPI; diff --git a/scripts/check-existing-tags.sh b/scripts/check-existing-tags.sh new file mode 100644 index 0000000000..dee1edabc3 --- /dev/null +++ b/scripts/check-existing-tags.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +alfresco_docker_image=$1 +# Verify release tags +get_tags="$(curl https://hub.docker.com/r/$alfresco_docker_image/tags/ | grep -o '\"result\".*\"]')" +arrayTags=($get_tags) + +echo "Existing Tags: $get_tags" + +for tag in "${arrayTags[@]}" +do + if [[ $tag = ${RELEASE_VERSION} ]]; then + echo "Tag ${RELEASE_VERSION} already pushed, release process will interrupt." + exit 0 + fi +done + +echo "The ${RELEASE_VERSION} tag was not found" diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..c9c6527983 --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -x + +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') + +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId +fi +#stop not needed container +docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') + +# Display containers resources usage after limitation +docker stats --no-stream diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..4435342437 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -e + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" + +git config user.email "build@alfresco.com" + +release_type=$1 +echo Release type: "$release_type" + +if [ -z $release_type ]; then + echo "Please provide a release type." + exit 1 +elif [ $release_type != "community" -a $release_type != "enterprise" ]; then + echo "The provided release type is not valid." + exit 1 +fi + +if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then + echo "Please provide a Release and Development verison" + exit 1 +fi + +# Docker Logins +echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin +echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io + +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; +then + deployment_repository="hotfix-release" +else + deployment_repository="${release_type}-release" +fi + +mvn --batch-mode \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${RELEASE_VERSION} \ + -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ + "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \ + release:clean release:prepare release:perform \ No newline at end of file diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh new file mode 100755 index 0000000000..35013b7053 --- /dev/null +++ b/scripts/set-release-variables.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" +release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') + +if [ ! -n "$release_message" ]; then + echo "The commit message is in the wrong format or it does not contain all the required properties." + exit 1 +fi + +export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) +export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') + +echo "Release version is set to $RELEASE_VERSION" +echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh new file mode 100644 index 0000000000..c8690dac21 --- /dev/null +++ b/scripts/zip-artifacts-release.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-repo:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-share:${RELEASE_VERSION}:amp \ + -DoutputDirectory=artifacts_dir + +mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \ + -Dartifact=org.alfresco:alfresco-rm-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \ + -DoutputDirectory=artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh new file mode 100755 index 0000000000..bada0395ae --- /dev/null +++ b/scripts/zip-artifacts-staging.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -e + +release_type=$1 + +mkdir "artifacts_dir" +cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-rm-${release_type}-repo-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-share/target/alfresco-rm-${release_type}-share-*.amp artifacts_dir +cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-rm-${release_type}-rest-api-explorer-*.war artifacts_dir + +cd artifacts_dir +zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip * + +# rm *.amp *.war -f +ls \ No newline at end of file