Re-organize

Author: sarahchen6

.gitlab-ci.yml

@@ -261,7 +261,7 @@ default:
       fi
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEMORY_MIN -Xmx$GRADLE_MEMORY_MAX -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
-    - export RELEASE_GRADLE_ARGS=" --no-build-cache --rerun-tasks --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
+    - export RELEASE_GRADLE_ARGS="${CI_COMMIT_TAG:+${GRADLE_ARGS/--build-cache/--no-build-cache --rerun-tasks}}"
     - *normalize_node_index
     # GitLab's cache helper restores .gradle as root, but we run as non-root-user (uid 1001),
     # and Gradle does `chmod 700 .gradle` on startup which requires user ownership.
@@ -338,13 +338,10 @@ build:
   script:
     - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi
     - ./gradlew --version
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        echo "=== RELEASE BUILD: assembling agent jar with build cache disabled ==="
-        ./gradlew clean :dd-java-agent:shadowJar :dd-java-agent:check :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests -x spotlessCheck $RELEASE_GRADLE_ARGS
-      else
-        ./gradlew clean :dd-java-agent:shadowJar :dd-java-agent:check :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests -x spotlessCheck $GRADLE_ARGS
-      fi
+    - EFFECTIVE_GRADLE_ARGS=${RELEASE_GRADLE_ARGS:-$GRADLE_ARGS}
+    - if [ -n "$CI_COMMIT_TAG" ]; then echo "=== Release build: assembling agent jar with build cache disabled ==="; fi
+    - echo "Running: ./gradlew clean :dd-java-agent:shadowJar :dd-java-agent:check :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests -x spotlessCheck $EFFECTIVE_GRADLE_ARGS"
+    - ./gradlew clean :dd-java-agent:shadowJar :dd-java-agent:check :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests -x spotlessCheck $EFFECTIVE_GRADLE_ARGS
     - echo UPSTREAM_TRACER_VERSION=$(java -jar workspace/dd-java-agent/build/libs/*.jar) >> upstream.env
     - echo "BUILD_JOB_NAME=$CI_JOB_NAME" >> build.env
     - echo "BUILD_JOB_ID=$CI_JOB_ID" >> build.env
@@ -1252,13 +1249,10 @@ deploy_to_maven_central:
     - export MAVEN_CENTRAL_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text)
     - export GPG_PRIVATE_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_private_key --with-decryption --query "Parameter.Value" --out text)
     - export GPG_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_passphrase --with-decryption --query "Parameter.Value" --out text)
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        echo "=== RELEASE BUILD: publishing artifacts with build cache disabled ==="
-        ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $RELEASE_GRADLE_ARGS
-      else
-        ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $GRADLE_ARGS
-      fi
+    - EFFECTIVE_GRADLE_ARGS=${RELEASE_GRADLE_ARGS:-$GRADLE_ARGS}
+    - if [ -n "$CI_COMMIT_TAG" ]; then echo "=== Release build: publishing artifacts with build cache disabled ==="; fi
+    - echo "Running: ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $EFFECTIVE_GRADLE_ARGS"
+    - ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $EFFECTIVE_GRADLE_ARGS
   artifacts:
     paths:
       - 'workspace/dd-java-agent/build/libs/*.jar'