From 2a3dc17a003a86ab1fa5718647aba7a18bd80924 Mon Sep 17 00:00:00 2001
From: Boris Baldassari <boris@chrysalice.org>
Date: Fri, 19 Feb 2021 22:24:23 +0100
Subject: [PATCH] #5 Fix deploy to eclipse downloads.

Signed-off-by: Boris Baldassari <boris@chrysalice.org>
---
 JenkinsfileGet => Jenkinsfile |  8 ++++----
 JenkinsfileDeploy             | 29 -----------------------------
 scripts/process_mboxes.sh     |  2 +-
 3 files changed, 5 insertions(+), 34 deletions(-)
 rename JenkinsfileGet => Jenkinsfile (91%)
 delete mode 100755 JenkinsfileDeploy

diff --git a/JenkinsfileGet b/Jenkinsfile
similarity index 91%
rename from JenkinsfileGet
rename to Jenkinsfile
index 4cb92ba..9e3d50d 100755
--- a/JenkinsfileGet
+++ b/Jenkinsfile
@@ -28,9 +28,9 @@ pipeline {
           perlbrew switch perl-5.30.1
           perl -v 
           Rscript --version
-          #cd scripts/ && sh ./process_mboxes.sh
-          #ls /data/eclipse_mls/ > ../website/content/eclipse_mls/list_mboxes.txt
-          #cp /data/eclipse_mls_full.csv website/content/eclipse_mls/
+          cd scripts/ && sh ./process_mboxes.sh
+          ls /data/eclipse_mls/ > ../website/content/eclipse_mls/list_mboxes.txt
+          cp /data/eclipse_mls_full.csv website/content/eclipse_mls/
         ''' 
       }
     }
@@ -43,7 +43,7 @@ pipeline {
           perlbrew switch perl-5.30.1
           perl -v 
           Rscript --version
-          #cd scripts/ && sh ./process_all_projects.sh
+          cd scripts/ && sh ./process_all_projects.sh
         ''' 
       }
     }
diff --git a/JenkinsfileDeploy b/JenkinsfileDeploy
deleted file mode 100755
index 56b7cbf..0000000
--- a/JenkinsfileDeploy
+++ /dev/null
@@ -1,29 +0,0 @@
-pipeline {
-  agent any
- 
-  stages {
-
-    stage('Retrieve Website') {
-      steps {
-        sh '''        
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/website/public/*zip*/public.zip -O public.zip
-          unzip -o public.zip
-        '''
-      }
-    }
-
-    stage('Deploy to downloads') {
-      steps {
-        sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-          sh '''
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/*
-            scp -r public/* genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/
-
-            ssh genie.scava@projects-storage.eclipse.org ls -lR /home/data/httpd/download.eclipse.org/scava/
-          '''
-        }
-      }
-    }
-
-  }
-}
diff --git a/scripts/process_mboxes.sh b/scripts/process_mboxes.sh
index ca1449b..e7e8b0a 100755
--- a/scripts/process_mboxes.sh
+++ b/scripts/process_mboxes.sh
@@ -90,7 +90,7 @@ if [ $run_csv -eq 1 ]; then
     echo "# Cleaning workspace"
     rm -rf csv/
 
-    echo "# Moving eclipse_mls_full.csv to datasets directory..."
+    echo "# Copy eclipse_mls_full.csv to datasets directory..."
     cp eclipse_mls_full_out.csv ${dir_scripts}/../website/content/eclipse_mls/eclipse_mls_full.csv
 	
     echo "# Checking file eclipse_mls_full.csv is in website/content/eclipse_mls..."
-- 
GitLab