From e918491140a9d3ffbd59cd1dd3d1297d1a835f74 Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 2 Oct 2020 13:48:37 +0300 Subject: [PATCH 01/39] 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 17d00af5e249590c0123d6aa0d49baf5a6472a68 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 6 Oct 2020 14:20:17 +0300 Subject: [PATCH 02/39] 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 592b6804418d09293e47a10378dfc38ff13a90cf Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 7 Oct 2020 16:02:26 +0300 Subject: [PATCH 03/39] 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 09d661785aec45df0e8bacfb2ccc7230676a27f8 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 8 Oct 2020 14:24:45 +0300 Subject: [PATCH 04/39] 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 60a656d3b89fe09f608fb7ac8027b18fa5ea1cdd Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 8 Oct 2020 15:10:48 +0300 Subject: [PATCH 05/39] 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 5b71f2ec05192c00fbe2b0c75f392b3267c39cb9 Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 9 Oct 2020 09:54:23 +0300 Subject: [PATCH 06/39] 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 7d3623a028f27fd5e9acc9de53a0c1a058dd6a3b Mon Sep 17 00:00:00 2001 From: ehardon Date: Fri, 9 Oct 2020 14:36:54 +0300 Subject: [PATCH 07/39] 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 fac128ec67f80f75499c34e8afff6643f054b3ce Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Fri, 9 Oct 2020 16:33:09 +0300 Subject: [PATCH 08/39] 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 e90b5431c37f5d200f4330755fabf5c8fbbfb124 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 10:58:34 +0300 Subject: [PATCH 09/39] 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 d46576abcf4061e7b69bddbf147b6589e5be4d4d Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 12:50:59 +0300 Subject: [PATCH 10/39] 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 af96d93e122d333a88adb334e9b4be590ce059cf Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:06:48 +0300 Subject: [PATCH 11/39] [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 b0014dbdd13003ca7eda2baf2fce44827b587731 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:14:37 +0300 Subject: [PATCH 12/39] [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 41b502268ec8dd785aa0251d5a0e0857060595dd Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 14 Oct 2020 13:18:01 +0300 Subject: [PATCH 13/39] 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 df03bfaef9b63e0150e3f410fd46e168538b7015 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 19 Oct 2020 13:42:15 +0300 Subject: [PATCH 14/39] 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 d5148dbf15ed9cb5b053bf4ebfa3b9e959aee8e5 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 19 Oct 2020 12:03:32 +0100 Subject: [PATCH 15/39] 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 585a015a0f386579b55578b4b42529b009c42b8a Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 19 Oct 2020 12:26:14 +0100 Subject: [PATCH 16/39] [internal enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] [skip tests] From a3e50fe8d0533ea5ff646707bf720d48b04d8cb0 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 19 Oct 2020 16:55:10 +0300 Subject: [PATCH 17/39] 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 b2c62d3ba383c575023e4caabf09a535d4a56e57 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 10:12:51 +0300 Subject: [PATCH 18/39] 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 12dbc5d5e7c7be7ee3052f1278778243e037360b Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 12:22:30 +0300 Subject: [PATCH 19/39] 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 267afe2ffcc0719fc79229f9900fbdccef06feba Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 15:17:08 +0300 Subject: [PATCH 20/39] 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 fa799e5111fb4be09e35be80b118837ccf392e25 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 15:21:24 +0300 Subject: [PATCH 21/39] [enterprise release 2.7.3-A1 2.7.3-SNAPSHOT] [skip tests] From 453c8e7b19e15d0b42730439e88e516dad4b73e9 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 12:56:23 +0000 Subject: [PATCH 22/39] [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 76755f707804e5e101f894198205be79a3cdc130 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 12:56:31 +0000 Subject: [PATCH 23/39] [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 833a6e8ce75c745103633c1ff2dd2264568339ca Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 16:45:58 +0300 Subject: [PATCH 24/39] 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 e552d35f24ec0fad43286759e9c6e3df5c7454f9 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 15:07:07 +0000 Subject: [PATCH 25/39] [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 a5b7e76f4480e8264ba970604efa456eb9fb08d0 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 20 Oct 2020 15:07:15 +0000 Subject: [PATCH 26/39] [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 2d7ffe4d1d71f68cad0dcd359d8f3b637d03a26c Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 20 Oct 2020 18:21:22 +0300 Subject: [PATCH 27/39] [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 b590d37f509ae3f209c667ffa0ef19298d7a859b Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 10:09:55 +0300 Subject: [PATCH 28/39] [enterprise release 2.7.3-A3 2.7.3-SNAPSHOT] [skip tests] From 1ac188b4cbbad0c2b35a6fdeddb36286ef4378f0 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 07:37:03 +0000 Subject: [PATCH 29/39] [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 fc1959f4bc2d180452da494cd0e8bc323f65a103 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 07:37:11 +0000 Subject: [PATCH 30/39] [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 de3576513333ee082fc54a30a0e6e8bec200b455 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 12:17:25 +0300 Subject: [PATCH 31/39] 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 c38aa9c7476cc9e234ea49a8a5e4507a327866bd Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 12:18:37 +0300 Subject: [PATCH 32/39] [enterprise release 2.7.3-A4 2.7.3-SNAPSHOT] [skip tests] From 2be86653f86ec8b15e6f3ab6c96a360fc5f70037 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 10:00:22 +0000 Subject: [PATCH 33/39] [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 abee730883e79f526c11f91f59156b920f09af8f Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 21 Oct 2020 10:00:30 +0000 Subject: [PATCH 34/39] [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 03e4a4703d1f72850ccbc5249f3a055d52fa6ca4 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 13:40:52 +0300 Subject: [PATCH 35/39] 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 3e6f7b00126f6f30e9f812123fa453c0b49dfd8d Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 13:41:23 +0300 Subject: [PATCH 36/39] [skip tests] From 8ffc33ecc293bf65f0bc15a1118087d08c5495d4 Mon Sep 17 00:00:00 2001 From: ehardon Date: Wed, 21 Oct 2020 14:37:19 +0300 Subject: [PATCH 37/39] 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 4ef23faa9bf6b00653b860629222fd7125373dd5 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 22 Oct 2020 11:32:02 +0300 Subject: [PATCH 38/39] - 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 a929beb737d055b3992a65684cc9d2ade1de8915 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 22 Oct 2020 13:25:17 +0300 Subject: [PATCH 39/39] - 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 \