Merge pull request #43 from iExecBlockchainComputing/release/7.0.2

Release/7.0.2

Author: james-toussaint

Dockerfile

@@ -1,11 +1,11 @@
 FROM openjdk:11.0.3-jre-slim
 
-ARG BUILD_VERSION
+ARG spring_boot_jar
 
-# the jar file is copied from "build/docker/"
-# by the gradle plugin "docker"
-COPY iexec-result-proxy-${BUILD_VERSION}.jar iexec-result-proxy.jar
+RUN test -n "$spring_boot_jar"
+
+COPY $spring_boot_jar iexec-result-proxy.jar
 
 # For Spring-Boot project, use the entrypoint
 # below to reduce Tomcat startup time.
-ENTRYPOINT exec java -Djava.security.egd=file:/dev/./urandom -jar iexec-result-proxy.jar
+ENTRYPOINT exec java -Djava.security.egd=file:/dev/./urandom -jar iexec-result-proxy.jar

Jenkinsfile

@@ -1,52 +1,11 @@
-pipeline {
-
-    agent any
-
-    stages {
-        stage('Test') {
-            steps {
-                // withCredentials([
-                //     string(credentialsId: 'ADDRESS_SONAR', variable: 'address_sonar'),
-                //     string(credentialsId: 'SONAR_CORE_TOKEN', variable: 'core_token')]){
-                //     sh './gradlew clean test sonarqube -Dsonar.projectKey=iexec-core -Dsonar.host.url=$address_sonar -Dsonar.login=$core_token --refresh-dependencies --no-daemon'
-                // }
-                // junit 'build/test-results/**/*.xml'
-                sh './gradlew clean test --refresh-dependencies --no-daemon'
-            }
-        }
-
-        stage('Build') {
-            steps {
-                sh './gradlew build --refresh-dependencies --no-daemon'
-            }
-        }
-
-        stage('Upload Jars') {
-            when {
-                anyOf{
-                    branch 'master'
-                    branch 'develop'
-                }
-            }
-            steps {
-                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'nexus', usernameVariable: 'NEXUS_USER', passwordVariable: 'NEXUS_PASSWORD']]) {
-                    sh './gradlew -PnexusUser=$NEXUS_USER -PnexusPassword=$NEXUS_PASSWORD uploadArchives --no-daemon'
-                }
-            }
-        }
-
-        stage('Build/Upload Docker image') {
-            when {
-                anyOf{
-                    branch 'master'
-                    branch 'develop'
-                }
-            }
-            steps {
-                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'nexus', usernameVariable: 'NEXUS_USER', passwordVariable: 'NEXUS_PASSWORD']]) {
-                    sh './gradlew -PnexusUser=$NEXUS_USER -PnexusPassword=$NEXUS_PASSWORD pushImage --no-daemon'
-                }
-            }
-        }
-    }
-}
+@Library('[email protected]') _
+buildJavaProject(
+        integrationTestsEnvVars: [],
+        shouldPublishJars: true,
+        shouldPublishDockerImages: true,
+        dockerfileDir: '.',
+        //dockerfileFilename: "Dockerfile-local",
+        buildContext: '.',
+        //dockerImageRepositoryName: '',
+        preProductionVisibility: 'docker.io',
+        productionVisibility: 'docker.io')

build.gradle

@@ -1,20 +1,19 @@
 plugins {
     id 'java'
-    id 'eclipse'
-    id 'maven'
-    id 'jacoco'
     id 'org.springframework.boot' version '2.2.5.RELEASE'
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-    id 'com.palantir.docker' version '0.25.0'
-    // id 'org.sonarqube' version '2.7'
-    // id 'com.palantir.graal' version '0.6.0-112-gca0b727'
+    id 'eclipse'
+    id 'jacoco'
+    id 'org.sonarqube' version '3.3'
+    id 'maven-publish'
 }
 
 group = 'com.iexec.result-proxy'
 sourceCompatibility = 11
 targetCompatibility = 11
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven {
         url 'https://nexus.iex.ec/repository/maven-public/'
@@ -28,7 +27,6 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
-    deployerJars
 }
 
 ext {
@@ -38,7 +36,6 @@ ext {
 dependencies {
     // iexec
     implementation "com.iexec.common:iexec-common:${iexecCommonVersion}"
-    // implementation files("../iexec-common/build/libs/iexec-common-${iexecCommonVersion}.jar")
 
     // Web3j issues, see core build.gradle
     implementation 'com.squareup.okhttp3:okhttp:4.3.1'
@@ -72,9 +69,6 @@ dependencies {
 
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.8'
-
-    // package cloud
-    deployerJars 'io.packagecloud.maven.wagon:maven-packagecloud-wagon:0.0.6'
 }
 
 dependencyManagement {
@@ -87,26 +81,24 @@ test {
     useJUnitPlatform()
 }
 
+task itest {
+    group 'Verification'
+    description 'Runs the integration tests.'
+}
+
 // the test coverage report is
 // created just before the build
-build.dependsOn jacocoTestReport
-
-// ######################
-// #     build meta     #
-// ######################
-
-def gitBranch = 'git name-rev --name-only HEAD'.execute().text.trim()
-def isMasterBranch = gitBranch == 'master'
-def isDevelopBranch = gitBranch == 'develop'
-def isSnapshotVersion = project.version.contains('SNAPSHOT')
-
-def nexusUser = project.hasProperty('nexusUser') ? project.getProperty('nexusUser') : ''
-def nexusPassword = project.hasProperty('nexusPassword') ? project.getProperty('nexusPassword') : ''
-def hasNexusProperties = !nexusUser.isEmpty() && !nexusPassword.isEmpty()
-
-def canUploadArchives = (isMasterBranch || isDevelopBranch ) && hasNexusProperties
-def canPushDockerImage = (isMasterBranch || isDevelopBranch ) && hasNexusProperties
-def canBuildDockerImage = isMasterBranch || isDevelopBranch || project.hasProperty('forceDockerBuild')
+jacoco {
+    toolVersion = "0.8.7"
+}
+// sonarqube code coverage requires jacoco XML report
+jacocoTestReport {
+    reports {
+        xml.enabled true
+    }
+}
+tasks.test.finalizedBy    tasks.jacocoTestReport
+tasks.sonarqube.dependsOn tasks.jacocoTestReport
 
 // ######################
 // #   create version   #
@@ -123,95 +115,32 @@ compileJava.dependsOn createVersion
 // #   upload archive   #
 // ######################
 
-project.ext.getNexusMaven = {
-    def nexusMavenBase = 'https://nexus.iex.ec/repository'
-    if (isSnapshotVersion) {
-        return nexusMavenBase + '/maven-snapshots/'
-    } else {
-        return nexusMavenBase + '/maven-releases/'
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact bootJar
+            from components.java
+        }
     }
-}
-
-uploadArchives {
-    enabled = canUploadArchives
-    repositories.mavenDeployer {
-        configuration = configurations.deployerJars
-        repository(url: getNexusMaven()) {
-            authentication(userName: nexusUser, password: nexusPassword)
+    repositories {
+        maven {
+            credentials {
+                username project.hasProperty('nexusUser') ? nexusUser : ''
+                password project.hasProperty('nexusPassword') ? nexusPassword : ''
+            }
+            url project.hasProperty('nexusUrl') ? nexusUrl : ''
         }
     }
 }
 
-// ######################
-// #	  docker		#
-// ######################
-
-// build, tag & push image
-// ./gradlew docker dockerTagDev dockerTagsPush
-
-def dockerImageBaseName = 'nexus.iex.ec/iexec-result-proxy'
-def gitShortCommit = 'git rev-parse --short HEAD'.execute().text.trim()
-def dockerImageTag = isSnapshotVersion ? "${version}-${gitShortCommit}" : version
-
-docker {
-    name 					"${dockerImageBaseName}:${dockerImageTag}"
-    tag 'FullTag', 			"${dockerImageBaseName}:${dockerImageTag}"
-    tag 'ShortCommitTag',	"${dockerImageBaseName}:${gitShortCommit}"
-    tag 'Dev',				"${dockerImageBaseName}:dev"
-    dockerfile file('Dockerfile')
-    files "build/libs/iexec-result-proxy-${project.version}.jar"
-    buildArgs([BUILD_VERSION: project.version])
-}
-
-task buildImage {
-    enabled = canBuildDockerImage
-    dependsOn tasks.docker
-}
-
-// docker build
-tasks.docker {
-    enabled = canBuildDockerImage
-}
-
-task pushImage {
-    enabled = canPushDockerImage
-    dependsOn dockerTagsPush
-}
-
-// docker login
-task dockerLogin(type: Exec) {
-    enabled = canPushDockerImage
-    commandLine('sh', '-c', "docker login -u ${nexusUser} -p ${nexusPassword} nexus.iex.ec")
-}
-
-// docker logout
-task dockerLogout(type: Exec) {
-    enabled = canPushDockerImage
-    commandLine('sh', '-c', 'docker logout nexus.iex.ec')
-}
-
-// docker push
-dockerTagsPush {
-    enabled = canPushDockerImage
-    // shouldRunAfter tasks.docker
-    dependsOn dockerLogin
-    finalizedBy dockerLogout
-}
-
-afterEvaluate {
-    // don't tag if image is not build
-    for(t in tasks.findAll{e -> e.name.contains("dockerTag")}) {
-        t.enabled = canBuildDockerImage
-    }
-    // don't push tags if canPushDockerImage == false
-    // (dockerPushFullTag, dockerPushShortCommitTag)
-    def dockerPushTasks = tasks.findAll{t -> t.name.contains("dockerPush")}
-    for(t in dockerPushTasks) {
-        t.enabled = canPushDockerImage
-    }
-    // don't push dev tag
-    dockerPushDev.enabled = false
+ext.bootJarPath    = relativePath(tasks.bootJar.outputs.files.singleFile)
+ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
+ext.ociImageName   = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
-    // create :dev tag after image build
-    buildImage.dependsOn dockerTagDev
+task buildImage(type: Exec) {
+    group       'Build'
+    description 'Builds an OCI image from a Dockerfile.'
+    dependsOn   tasks.bootJar
+    commandLine ("sh", "-c", "docker build --build-arg spring_boot_jar=$bootJarPath -t $ociImageName:$gitShortCommit ."
+            + " && docker tag $ociImageName:$gitShortCommit $ociImageName:dev")
 }

gradle.properties

@@ -1,2 +1,2 @@
-version=7.0.1
+version=7.0.2
 iexecCommonVersion=5.9.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell