diff --git a/.azure/build-pipeline.yaml b/.azure/build-pipeline.yaml index 18598f5b..9a55248a 100644 --- a/.azure/build-pipeline.yaml +++ b/.azure/build-pipeline.yaml @@ -70,7 +70,7 @@ stages: dependsOn: - container_build - docs_build - condition: and(succeeded(), or(eq(variables['build.sourceBranch'], 'refs/heads/main'), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'))) + #condition: and(succeeded(), or(eq(variables['build.sourceBranch'], 'refs/heads/main'), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'))) jobs: - template: 'templates/jobs/deploy_java.yaml' parameters: diff --git a/.azure/scripts/push-to-nexus.sh b/.azure/scripts/push-to-nexus.sh index 771569ba..c786bda5 100755 --- a/.azure/scripts/push-to-nexus.sh +++ b/.azure/scripts/push-to-nexus.sh @@ -1,10 +1,13 @@ #!/usr/bin/env bash -set -e +#set -e echo "Build reason: ${BUILD_REASON}" echo "Source branch: ${BRANCH}" +echo "JAVA_HOME: " ${JAVA_HOME} +mvn -version + function cleanup() { rm -rf signing.gpg gpg --delete-keys @@ -18,6 +21,6 @@ export GPG_TTY=$(tty) echo $GPG_SIGNING_KEY | base64 -d > signing.gpg gpg --batch --import signing.gpg -GPG_EXECUTABLE=gpg mvn $MVN_ARGS -DskipTests -s ./.azure/scripts/settings.xml -P ossrh verify deploy +#GPG_EXECUTABLE=gpg mvn $MVN_ARGS -DskipTests -s ./.azure/scripts/settings.xml -P ossrh verify deploy cleanup \ No newline at end of file diff --git a/.azure/templates/jobs/deploy_java.yaml b/.azure/templates/jobs/deploy_java.yaml index 0a6a74bc..346a9a7c 100644 --- a/.azure/templates/jobs/deploy_java.yaml +++ b/.azure/templates/jobs/deploy_java.yaml @@ -1,6 +1,13 @@ jobs: - job: 'deploy_java' displayName: 'Deploy Java' + # Strategy for the job + strategy: + matrix: + 'java-17': + image: 'Ubuntu-22.04' + jdk_version: '17' + main_build: 'true' # Set timeout for jobs timeoutInMinutes: 60 # Base system @@ -8,6 +15,7 @@ jobs: vmImage: 'Ubuntu-22.04' # Pipeline steps steps: + - template: '../steps/prerequisites/install_java.yaml' - task: DownloadPipelineArtifact@2 inputs: source: '${{ parameters.artifactSource }}'