Skip to content

Commit

Permalink
Trigger notarization job from all relevant Jenkins files
Browse files Browse the repository at this point in the history 
This has been tested with previous changes in the test Jenkins file:
tracecompass-test.Jenkinsfile

Remove tracecompass-notarize.Jenkinsfile because it's not needed.

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
  • Loading branch information
@bhufmann
bhufmann committed Mar 21, 2024
1 parent f41ac7b commit 6bcff19
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 60 deletions.
11 changes: 1 addition & 10 deletions jenkins/pipelines/tracecompass-jdk17-mvn38.Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ pipeline {
sh 'cp scripts/deploy-update-site.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/deploy-doc.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/deploy-javadoc.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/macosx-notarize.sh ${MAVEN_WORKSPACE_SCRIPTS}'
checkout([$class: 'GitSCM', branches: [[name: '$GERRIT_BRANCH_NAME']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']]], submoduleCfg: [], userRemoteConfigs: [[refspec: '$GERRIT_REFSPEC', url: '$GERRIT_REPOSITORY_URL']]])
sh 'mkdir -p ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-rcp.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-update-site.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-doc.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-javadoc.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/macosx-notarize.sh ${WORKSPACE_SCRIPTS}'
}
}
}
Expand Down Expand Up @@ -165,14 +163,7 @@ pipeline {
expression { return params.NOTARIZE_MAC_RCP }
}
steps {
sshagent (['projects-storage.eclipse.org-bot-ssh']) {
sh '${WORKSPACE_SCRIPTS}/macosx-notarize.sh ${RCP_DESTINATION}'
}
}
post {
always {
archiveArtifacts artifacts: '*.log', allowEmptyArchive: true
}
build job:'notarize-tracecompass-dmgs' , parameters:[string(name: 'RCP_DESTINATION',value: params.RCP_DESTINATION)]
}
}
}
Expand Down
11 changes: 1 addition & 10 deletions jenkins/pipelines/tracecompass-jdk17.Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ pipeline {
sh 'cp scripts/deploy-update-site.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/deploy-doc.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/deploy-javadoc.sh ${MAVEN_WORKSPACE_SCRIPTS}'
sh 'cp scripts/macosx-notarize.sh ${MAVEN_WORKSPACE_SCRIPTS}'
checkout([$class: 'GitSCM', branches: [[name: '$GERRIT_BRANCH_NAME']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']]], submoduleCfg: [], userRemoteConfigs: [[refspec: '$GERRIT_REFSPEC', url: '$GERRIT_REPOSITORY_URL']]])
sh 'mkdir -p ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-rcp.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-update-site.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-doc.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/deploy-javadoc.sh ${WORKSPACE_SCRIPTS}'
sh 'cp ${MAVEN_WORKSPACE_SCRIPTS}/macosx-notarize.sh ${WORKSPACE_SCRIPTS}'
}
}
}
Expand Down Expand Up @@ -165,14 +163,7 @@ pipeline {
expression { return params.NOTARIZE_MAC_RCP }
}
steps {
sshagent (['projects-storage.eclipse.org-bot-ssh']) {
sh '${WORKSPACE_SCRIPTS}/macosx-notarize.sh ${RCP_DESTINATION}'
}
}
post {
always {
archiveArtifacts artifacts: '*.log', allowEmptyArchive: true
}
build job:'notarize-tracecompass-dmgs' , parameters:[string(name: 'RCP_DESTINATION',value: params.RCP_DESTINATION)]
}
}
}
Expand Down
40 changes: 0 additions & 40 deletions jenkins/pipelines/tracecompass-notarize.Jenkinsfile
View file

This file was deleted.

0 comments on commit 6bcff19

Please sign in to comment.