From 9ae0efe0cd4c0e40c07e9923a1d79ef9cab5c34e Mon Sep 17 00:00:00 2001
From: s487179 <wojbal2@st.amu.edu.pl>
Date: Thu, 13 Apr 2023 22:26:46 +0200
Subject: [PATCH] edit Jenkinsfile and add datasetscript.sh

---
 Jenkinsfile      | 58 ++++++++++++++++++++++++++----------------------
 datasetscrpit.sh |  3 +++
 2 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 datasetscrpit.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index a5ae955..c449314 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,27 +1,33 @@
-node {
-    stage('Preparation') { 
-        properties([
-            parameters([
-                string(
-                    defaultValue: 'wojciechbatruszewicz',
-                    description: 'Kaggle username',
-                    name: 'KAGGLE_USERNAME',
-                    trim: false
-                ),
-                password(
-                    defaultValue: '',
-                    description: 'Kaggle token taken from kaggle.json file, as described in https://github.com/Kaggle/kaggle-api#api-credentials',
-                    name: 'KAGGLE_KEY'
-                )
-            ])
-        ])
-    }
-    stage('Build') {
-        // Run the maven build
-        withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
+pipeline {
+   agent any
+   parameters {
+     string(
+            defaultValue: 'wojciechbatruszewicz',
+            description: 'Kaggle username',
+            name: 'KAGGLE_USERNAME',
+            trim: false
+         ),
+      password(
+         defaultValue: '',
+         description: 'Kaggle token taken from kaggle.json file, as described in https://github.com/Kaggle/kaggle-api#api-credentials',
+         name: 'KAGGLE_KEY'
+      )
+   }
+   stages {
+      stage('Configure kaggle') {
+         steps {
+            // Run the maven build
+            withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
                  "KAGGLE_KEY=${params.KAGGLE_KEY}" ]) {
-            sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
-            sh 'kaggle datasets list'
-        }
-    }
-}
\ No newline at end of file
+               sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
+               sh 'kaggle datasets list'
+            }
+         }
+      }
+      stage('Run sh file') {
+         steps {
+            sh './datasetscript.sh'
+         }
+      }              
+   }
+}
diff --git a/datasetscrpit.sh b/datasetscrpit.sh
new file mode 100644
index 0000000..786ff86
--- /dev/null
+++ b/datasetscrpit.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
+sh 'kaggle datasets list'
\ No newline at end of file