Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@
@Library('global-jenkins-library@support/2.7.4') _

String repositoryName = 'iexec-sms'

buildInfo = buildJavaProject(
buildJavaProject(
shouldPublishJars: true,
shouldPublishDockerImages: true)

// add parameters for non-PR builds when branch is not develop or production branch
boolean addParameters = !buildInfo.isPullRequestBuild && !buildInfo.isDevelopBranch && !buildInfo.isProductionBranch

// Override properties defined in getBuildInfo and add parameters
if (addParameters) {
properties([
buildDiscarder(logRotator(numToKeepStr: '10')),
parameters([booleanParam(description: 'Build TEE images', name: 'BUILD_TEE')])
])
}

// BUILD_TEE parameter only exists if addParameters is true
// If BUILD_TEE is false, TEE builds won't be executed and we return here
if (addParameters && !params.BUILD_TEE) {
return
}

sconeBuildUnlocked(
nativeImage: "docker-regis.iex.ec/$repositoryName:$buildInfo.imageTag",
imageName: repositoryName,
imageTag: buildInfo.imageTag,
sconifyArgsPath: './docker/sconify.args',
sconifyImage: 'scone-debug/iexec-sconify-image-unlocked',
sconifyVersion: '5.8.8'
)
9 changes: 0 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,3 @@ tasks.register('buildImage', Exec) {
dependsOn bootJar
commandLine 'docker', 'build', '--build-arg', 'jar=' + jarPathForOCI, '-t', ociImageName + ':dev', '.'
}

tasks.register('buildSconeImage', Exec) {
group "Build"
description "Build an OCI image compatible with scontain TEE framework"
dependsOn buildImage
commandLine "docker/sconify.sh"
environment "IMG_FROM", "$ociImageName:dev"
environment "IMG_TO", "$ociImageName-unlocked:dev"
}
13 changes: 0 additions & 13 deletions docker/sconify.args

This file was deleted.

24 changes: 0 additions & 24 deletions docker/sconify.sh

This file was deleted.

Loading