From 6db0c4293619a709bca5ca57b2220afd53c8c7a1 Mon Sep 17 00:00:00 2001 From: "don.sizemore" Date: Fri, 12 Nov 2021 13:26:05 -0500 Subject: [PATCH] #182 previewers moved to gdcc repo, bump to v1.2 --- defaults/main.yml | 2 +- files/dataverse-previewers.sh | 40 ++++++++++++++++---------------- tasks/dataverse-previewers.yml | 5 ++++ tests/group_vars/jenkins.yml | 2 +- tests/group_vars/memorytests.yml | 2 +- tests/group_vars/vagrant.yml | 2 +- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a651085..0c15224 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -143,7 +143,7 @@ dataverse: previewers: enabled: true on_same_server: true - zip_url: https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers/archive/1.1.1.zip + zip_url: https://github.com/gdcc/dataverse-previewers/releases/download/1.2/dataverse-previewers-1.2.zip dir: /var/www/html sampledata: enabled: false diff --git a/files/dataverse-previewers.sh b/files/dataverse-previewers.sh index 6db4b56..fc449e2 100755 --- a/files/dataverse-previewers.sh +++ b/files/dataverse-previewers.sh @@ -7,7 +7,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"textPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/TextPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/TextPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -28,7 +28,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"htmlPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/HtmlPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/HtmlPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -49,7 +49,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"audioPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/AudioPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/AudioPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -70,7 +70,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"audioPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/AudioPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/AudioPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -91,7 +91,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"audioPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/AudioPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/AudioPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -112,7 +112,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"audioPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/AudioPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/AudioPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -133,7 +133,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"imagePreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/ImagePreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/ImagePreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -154,7 +154,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"imagePreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/ImagePreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/ImagePreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -175,7 +175,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"imagePreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/ImagePreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/ImagePreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -196,7 +196,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"pdfPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/PDFPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/PDFPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -217,7 +217,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"videoPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/VideoPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/VideoPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -238,7 +238,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"videoPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/VideoPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/VideoPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -259,7 +259,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"videoPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/VideoPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/VideoPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -280,7 +280,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"spreadsheetPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/SpreadsheetPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/SpreadsheetPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -301,7 +301,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"spreadsheetPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/SpreadsheetPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/SpreadsheetPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -322,7 +322,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"spreadsheetPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/SpreadsheetPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/SpreadsheetPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -343,7 +343,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"spreadsheetPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/SpreadsheetPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/SpreadsheetPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -364,7 +364,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"stataPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/TextPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/TextPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -385,7 +385,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"rPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/TextPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/TextPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, @@ -406,7 +406,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin "toolName":"annotationPreviewer", "scope":"file", "types":["preview"], - "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.1/HypothesisPreview.html", + "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/v1.2/HypothesisPreview.html", "toolParameters": { "queryParameters":[ {"fileid":"{fileId}"}, diff --git a/tasks/dataverse-previewers.yml b/tasks/dataverse-previewers.yml index 43c5ddf..d34f7e6 100644 --- a/tasks/dataverse-previewers.yml +++ b/tasks/dataverse-previewers.yml @@ -23,6 +23,11 @@ shell: 'mv {{ dataverse.previewers.dir }}/dataverse-previewers-* {{ dataverse.previewers.dir }}/dataverse-previewers' when: dataverse.previewers.on_same_server == true +- name: 1.2 release zip includes 1.1.1 + file: + path: '{{ dataverse.previewers.dir }}/dataverse-previewers/previewers/v1.1.1' + state: absent + - name: upload dataverse-previewers.sh script copy: src: dataverse-previewers.sh diff --git a/tests/group_vars/jenkins.yml b/tests/group_vars/jenkins.yml index 971a016..8190068 100644 --- a/tests/group_vars/jenkins.yml +++ b/tests/group_vars/jenkins.yml @@ -134,7 +134,7 @@ dataverse: previewers: enabled: false on_same_server: true - zip_url: https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers/archive/1.1.1.zip + zip_url: https://github.com/gdcc/dataverse-previewers/releases/download/1.2/dataverse-previewers-1.2.zip dir: /var/www/html sampledata: enabled: false diff --git a/tests/group_vars/memorytests.yml b/tests/group_vars/memorytests.yml index c03d694..cca4f26 100644 --- a/tests/group_vars/memorytests.yml +++ b/tests/group_vars/memorytests.yml @@ -137,7 +137,7 @@ dataverse: previewers: enabled: true on_same_server: true - zip_url: https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers/archive/1.1.1.zip + zip_url: https://github.com/gdcc/dataverse-previewers/releases/download/1.2/dataverse-previewers-1.2.zip dir: /var/www/html sampledata: enabled: true diff --git a/tests/group_vars/vagrant.yml b/tests/group_vars/vagrant.yml index 2e6440a..3a5a888 100644 --- a/tests/group_vars/vagrant.yml +++ b/tests/group_vars/vagrant.yml @@ -139,7 +139,7 @@ dataverse: previewers: enabled: true on_same_server: true - zip_url: https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers/archive/1.1.1.zip + zip_url: https://github.com/gdcc/dataverse-previewers/releases/download/1.2/dataverse-previewers-1.2.zip dir: /var/www/html sampledata: enabled: false