Merge pull request #5411 from brucehoff/PLFM-9253

PLFM-9253

Author: marcomarasca

.github/workflows/build_and_test.yml

@@ -77,7 +77,7 @@ jobs:
           if [[ $GITHUB_REPOSITORY_OWNER == "Sage-Bionetworks" ]]; then
             if [[ $branch == "develop" ]]; then
               GIT_COMMIT=${{ github.sha }}
-              ARTIFACT_VERSION=$(date +%Y-%m-%d)"-"${GIT_COMMIT:0:7}
+              ARTIFACT_VERSION=$(date +%Y-%m-%d_%H-%M)"_"${GIT_COMMIT:0:7}
             elif [[ $branch =~ "release-" ]]; then
               ARTIFACT_VERSION=${{ steps.find_tag.outputs.previous_version }}
             fi

configuration/build/buildspec.yml

@@ -56,8 +56,6 @@ phases:
       fi
 
       if [ "${FULL_BUILD}" == "true" ]; then
-        export artifactory_username=$(echo $ARTIFACTORY_CREDS | jq -r '.artifactory_username')
-        export artifactory_password=$(echo $ARTIFACTORY_CREDS | jq -r '.artifactory_password')
         export org_sagebionetworks_datacite_enabled=true
         export org_sagebionetworks_doi_prefix=10.33627
         export org_sagebionetworks_doi_datacite_api_endpoint=mds.test.datacite.org

docker_build.sh

@@ -86,7 +86,7 @@ mysql -u${rds_user_name} -p${rds_password} -h ${org_sagebionetworks_table_cluste
 # create build container and run build
 docker run --user "$(id -u):$(id -g)" -i --rm --name ${build_container_name} \
 -m 5500M \
--v ${m2_cache_parent_folder}/.m2:/tmp/.m2 \
+-v ${m2_cache_parent_folder}/.m2:/root/.m2 \
 -v ${src_folder}:/repo \
 -v /etc/localtime:/etc/localtime:ro \
 -e MAVEN_OPTS="-Xms256m -Xmx2048m -XX:MaxPermSize=512m" \
@@ -118,7 +118,7 @@ ${AWS_CREDS} \
 -Dorg.sagebionetworks.cloudfront.keypair="${org_sagebionetworks_cloudfront_keypair}" \
 -Dorg.sagebionetworks.cloudfront.domainname="${org_sagebionetworks_cloudfront_domainname}" \
 -Dorg.sagebionetworks.cloudfront.private.key.secret="${org_sagebionetworks_cloudfront_private_key_secret}" \
--Duser.home=/tmp"
+-Duser.home=/root"
 
 clean_up_container ${build_container_name}