From 5bf7dca8ea9f3695891c9957b1cb6b5d67dba669 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Tue, 17 May 2022 12:30:19 -0500 Subject: [PATCH] Removed steps involving shell operations. --- Jenkinsfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f75bf3d..fde3072 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,12 +14,12 @@ pipeline { } } steps { - sh 'echo "eula=true" > eula.txt' - sh "chmod u+x ./run_trial.sh" - sh "curl -o mods/DynmapBlockScan.jar -LJR https://github.com/webbukkit/DynmapBlockScan/releases/download/v3.4-beta-1/DynmapBlockScan-3.4-beta-1-forge-1.18.jar" - sh 'echo "stop" | ./run_trial.sh' + fileOperations([fileCreateOperation(fileContent: 'eula=true', fileName: 'eula.txt')]) + pwsh returnStatus: true, script: 'chmod u+x ./run_trial.sh' + fileOperations([fileDownloadOperation(password: '', proxyHost: '', proxyPort: '', targetFileName: 'DynmapBlockScan.jar', targetLocation: 'mods/', url: 'https://github.com/webbukkit/DynmapBlockScan/releases/download/v3.4-beta-1/DynmapBlockScan-3.4-beta-1-forge-1.18.jar', userName: '')]) + pwsh 'echo "stop" | ./run_trial.sh' logParser failBuildOnError: true, projectRulePath: 'Jenkinsparse', parsingRulesPath: 'Jenkinsparse', showGraphs: true, unstableOnWarning: true, useProjectRule: true - sh "rm mods/DynmapBlockScan.jar" + fileOperations([fileDeleteOperation(excludes: '', includes: 'mods/DynmapBlockScan.jar')]) } } stage("cleanup") { @@ -29,8 +29,8 @@ pipeline { } } steps { - sh "git clean -dfX" - sh "rm -rf world" + pwsh "git clean -dfX" + pwsh "rm -rf world" } } stage("deploy") { @@ -39,11 +39,11 @@ pipeline { } steps { sshagent(['ce4c701d-098c-4706-8f32-c0af996a7769']) { - sh "ssh -o StrictHostKeyChecking=no gamehost@entertainment 'systemctl --user stop rsemcs'" - sh "rsync -a --update --exclude ./mods/ --exclude ./config/ ./** gamehost@entertainment:/home/gamehost/mcserver/" - sh "rsync -a --update --delete ./mods/ gamehost@entertainment:/home/gamehost/mcserver/mods" - sh "rsync -a --update --delete ./config/ gamehost@entertainment:/home/gamehost/mcserver/config" - sh "ssh gamehost@entertainment 'systemctl --user start rsemcs'" + pwsh "ssh -o StrictHostKeyChecking=no gamehost@entertainment 'systemctl --user stop rsemcs'" + pwsh "rsync -a --update --exclude ./mods/ --exclude ./config/ ./** gamehost@entertainment:/home/gamehost/mcserver/" + pwsh "rsync -a --update --delete ./mods/ gamehost@entertainment:/home/gamehost/mcserver/mods" + pwsh "rsync -a --update --delete ./config/ gamehost@entertainment:/home/gamehost/mcserver/config" + pwsh "ssh gamehost@entertainment 'systemctl --user start rsemcs'" } } }