Stages => Steps

vars/runTask.groovy

@@ -6,52 +6,57 @@ def call(String branch, String repo, String task, String phpversion, String data
 
         stages {
             stage("Git Checkout") {
-                checkout(
-                    [
-                        $class: 'GitSCM',
-                        branches: [
-                            [
-                                name: "*/${config.branch}"
-                            ]
-                        ],
-                        doGenerateSubmoduleConfigurations: false,
-                        extensions: [
-                            [
-                                $class: 'CloneOption',
-                                depth: 0,
-                                noTags: false,
-                                reference: "${env.HOME}/cache/integration.git",
-                                shallow: false
+                steps {
+                    checkout(
+                        [
+                            $class: 'GitSCM',
+                            branches: [
+                                [
+                                    name: "*/${config.branch}"
+                                ]
                             ],
-                            [
-                                $class: 'RelativeTargetDirectory',
-                                relativeTargetDir: 'moodle'
-                            ]
-                        ],
-                        submoduleCfg: [],
-                        userRemoteConfigs: [
-                            [
-                                url: "${config.repo}"
+                            doGenerateSubmoduleConfigurations: false,
+                            extensions: [
+                                [
+                                    $class: 'CloneOption',
+                                    depth: 0,
+                                    noTags: false,
+                                    reference: "${env.HOME}/cache/integration.git",
+                                    shallow: false
+                                ],
+                                [
+                                    $class: 'RelativeTargetDirectory',
+                                    relativeTargetDir: 'moodle'
+                                ]
+                            ],
+                            submoduleCfg: [],
+                            userRemoteConfigs: [
+                                [
+                                    url: "${config.repo}"
+                                ]
                             ]
                         ]
-                    ]
-                )
+                    )
+                }
             }
 
             stage("Run ${config.task}") {
-                withEnv([
-                    "PHP_VERSION=${config.phpversion}",
-                    "DBTYPE=${config.database}",
-                    "TASK=${config.task}"
-                ]) {
+                environment {
+                    PHP_VERSION = "${config.phpversion}"
+                    DBTYPE = "${config.database}"
+                    TASK = "${config.task}"
+                }
+                steps {
                     sh '$HOME/scripts/runner/master/run.sh'
                 }
             }
 
             stage("Post") {
-                junit allowEmptyResults: true, testResults: '${env.BUILD_ID}/*.junit/*.xml,${env.BUILD_ID}/*.junit'
-                archiveArtifacts allowEmptyArchive: true, artifacts: '${env.BUILD_ID}/**'
-                cleanWs deleteDirs: true, notFailBuild: true
+                steps {
+                    junit allowEmptyResults: true, testResults: '${env.BUILD_ID}/*.junit/*.xml,${env.BUILD_ID}/*.junit'
+                    archiveArtifacts allowEmptyArchive: true, artifacts: '${env.BUILD_ID}/**'
+                    cleanWs deleteDirs: true, notFailBuild: true
+                }
             }
         }
     }