From 1948e6ed2f8e36b9d60cba70de3701030918f9de Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Wed, 29 Apr 2026 14:01:02 +0200 Subject: [PATCH] fix: remove sconification steps --- Jenkinsfile | 31 +------------------------------ build.gradle | 9 --------- docker/sconify.args | 13 ------------- docker/sconify.sh | 24 ------------------------ 4 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 docker/sconify.args delete mode 100755 docker/sconify.sh diff --git a/Jenkinsfile b/Jenkinsfile index 83ad3b55..90d1fd8d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' -) diff --git a/build.gradle b/build.gradle index 662e05ce..7096953f 100644 --- a/build.gradle +++ b/build.gradle @@ -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" -} diff --git a/docker/sconify.args b/docker/sconify.args deleted file mode 100644 index cf46e723..00000000 --- a/docker/sconify.args +++ /dev/null @@ -1,13 +0,0 @@ ---verbose \ ---name=iexec-sms \ ---base=${IMG_FROM} \ ---from=${IMG_FROM} \ ---to=${IMG_TO} \ ---binary=/opt/java/openjdk/bin/java \ ---heap="8G" \ ---stack="8M" \ ---binary-fs \ ---fs-dir=/app \ ---mprotect=1 \ ---host-path=/etc/hosts \ ---host-path=/etc/resolv.conf \ diff --git a/docker/sconify.sh b/docker/sconify.sh deleted file mode 100755 index 1ab9502b..00000000 --- a/docker/sconify.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -cd $(dirname $0) - -SCONE_IMG_NAME=scone-debug/iexec-sconify-image-unlocked -SCONE_IMG_VERSION=5.8.8 - -IMG_TO=${IMG_FROM}-sconify-${SCONE_IMG_VERSION}-debug - -ARGS=$(sed -e "s'\${IMG_FROM}'${IMG_FROM}'" -e "s'\${IMG_TO}'${IMG_TO}'" sconify.args) -echo $ARGS - -SCONE_IMAGE="registry.scontain.com/${SCONE_IMG_NAME}:${SCONE_IMG_VERSION}" - -/bin/bash -c "docker run -t --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - ${SCONE_IMAGE} \ - sconify_iexec \ - --cli=${SCONE_IMAGE} \ - --crosscompiler=${SCONE_IMAGE} \ - $ARGS" - -echo -docker run --rm -e SCONE_HASH=1 $IMG_TO