Merge pull request #54 from IQSS/develop

Update from IQSS

Dockerfile

@@ -1 +1 @@
-# See `conf/docker` for Docker images
+# See http://guides.dataverse.org/en/latest/developers/containers.html

README.md

@@ -18,7 +18,7 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi
 [![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg?raw=true "Dataverse Project")](http://dataverse.org)
 
 [![API Test Status](https://jenkins.dataverse.org/buildStatus/icon?job=IQSS-dataverse-develop&subject=API%20Test%20Status)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
-[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
+[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/ws/target/coverage-it/index.html)
 [![Unit Test Status](https://img.shields.io/travis/IQSS/dataverse?label=Unit%20Test%20Status)](https://travis-ci.org/IQSS/dataverse)
 [![Unit Test Coverage](https://img.shields.io/coveralls/github/IQSS/dataverse?label=Unit%20Test%20Coverage)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
 

Vagrantfile

@@ -1,77 +1,41 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.define "standalone", primary: true do |standalone|
-    config.vm.hostname = "standalone"
-    # Uncomment this temporarily to get `vagrant destroy` to work
-    #standalone.vm.box = "puppetlabs/centos-7.2-64-puppet"
-
-    operating_system = "centos"
-    if ENV['OPERATING_SYSTEM'].nil?
-      config.vm.box = "puppetlabs/centos-7.2-64-puppet"
-      config.vm.box_version = '1.0.1'
-    elsif ENV['OPERATING_SYSTEM'] == 'debian'
-      puts "WARNING: Debian specified. Here be dragons! https://github.com/IQSS/dataverse/issues/1059"
-      config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box"
-      config.vm.box = "puppet-vagrant-boxes.puppetlabs.com-debian-73-x64-virtualbox-puppet.box"
-    else
-      operating_system = ENV['OPERATING_SYSTEM']
-      puts "Not sure what do to with operating system: #{operating_system}"
-      exit 1
-    end
-
-    mailserver = "localhost"
-    if ENV['MAIL_SERVER'].nil?
-      puts "MAIL_SERVER environment variable not specified. Using #{mailserver} by default.\nTo specify it in bash: export MAIL_SERVER=localhost"
-    else
-      mailserver = ENV['MAIL_SERVER']
-      puts "MAIL_SERVER environment variable found, using #{mailserver}"
-    end
-
-    config.vm.provider "virtualbox" do |v|
-      v.memory = 2048
-      v.cpus = 1
-    end
-    config.vm.provision "shell", path: "scripts/vagrant/setup.sh"
-    config.vm.provision "shell", path: "scripts/vagrant/setup-solr.sh"
-    config.vm.provision "shell", path: "scripts/vagrant/install-dataverse.sh", args: mailserver
-    # FIXME: get tests working and re-enable them!
-    #config.vm.provision "shell", path: "scripts/vagrant/test.sh"
-
-    config.vm.network "private_network", type: "dhcp"
-    config.vm.network "forwarded_port", guest: 80, host: 8888
-    config.vm.network "forwarded_port", guest: 443, host: 9999
-    config.vm.network "forwarded_port", guest: 8983, host: 8993
-    config.vm.network "forwarded_port", guest: 8080, host: 8088
-    config.vm.network "forwarded_port", guest: 8181, host: 8188
-
-    # FIXME: use /dataverse/downloads instead
-    config.vm.synced_folder "downloads", "/downloads"
-    # FIXME: use /dataverse/conf instead
-    config.vm.synced_folder "conf", "/conf"
-    # FIXME: use /dataverse/scripts instead
-    config.vm.synced_folder "scripts", "/scripts"
-    config.vm.synced_folder ".", "/dataverse"
-  end
-
-  config.vm.define "solr", autostart: false do |solr|
-    config.vm.hostname = "solr"
-    solr.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box"
-    config.vm.synced_folder ".", "/dataverse"
-    config.vm.network "private_network", type: "dhcp"
-    config.vm.network "forwarded_port", guest: 8983, host: 9001
+  config.vm.box = "bento/centos-7.7"
+
+  puts "Sorry, this Vagrant environment is not working."
+  puts "If you'd like to help get it working, please see"
+  puts "https://github.com/IQSS/dataverse/issues/6849"
+  puts
+  puts "You can also try the Vagrant environment at"
+  puts "https://github.com/IQSS/dataverse-ansible"
+  exit 1
+
+  config.vm.provider "virtualbox" do |vbox|
+    vbox.cpus = 4
+    vbox.memory = 4096
   end
 
-  config.vm.define "test", autostart: false do |test|
-    config.vm.hostname = "test"
-    test.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box"
-    config.vm.synced_folder ".", "/dataverse"
-    config.vm.network "private_network", type: "dhcp"
-  end
+  #config.vm.provision "shell", path: "scripts/vagrant/setup.sh"
+  #config.vm.provision "shell", path: "scripts/vagrant/setup-solr.sh"
+  config.vm.provision "shell", path: "scripts/vagrant/install-dataverse.sh"
+
+  config.vm.network "private_network", type: "dhcp"
+  config.vm.network "forwarded_port", guest: 80, host: 8888
+  config.vm.network "forwarded_port", guest: 443, host: 9999
+  config.vm.network "forwarded_port", guest: 8983, host: 8993
+  config.vm.network "forwarded_port", guest: 8080, host: 8088
+  config.vm.network "forwarded_port", guest: 8181, host: 8188
+
+  # FIXME: use /dataverse/downloads instead
+  config.vm.synced_folder "downloads", "/downloads"
+  # FIXME: use /dataverse/conf instead
+  config.vm.synced_folder "conf", "/conf"
+  # FIXME: use /dataverse/scripts instead
+  config.vm.synced_folder "scripts", "/scripts"
+  config.vm.synced_folder ".", "/dataverse"
 
 end

conf/docker-aio/c7.dockerfile

@@ -1,6 +1,6 @@
 FROM centos:7
 # OS dependencies
-RUN yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
+RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
 #RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd
 RUN yum install -y java-1.8.0-openjdk-devel postgresql96-server sudo epel-release unzip perl curl httpd
 RUN yum install -y jq lsof awscli

conf/docker-aio/run-test-suite.sh

@@ -8,4 +8,4 @@ fi
 
 # Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment.
 # TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml.
-mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT -Ddataverse.test.baseurl=$dvurl
+mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT -Ddataverse.test.baseurl=$dvurl

conf/docker-aio/testscripts/install

@@ -15,7 +15,7 @@ export SMTP_SERVER=localhost
 export MEM_HEAP_SIZE=2048
 export GLASSFISH_DOMAIN=domain1
 cd scripts/installer
-cp pgdriver/postgresql-42.2.9.jar $GLASSFISH_ROOT/glassfish/lib
+cp pgdriver/postgresql-42.2.12.jar $GLASSFISH_ROOT/glassfish/lib
 #cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 cp /opt/dv/testdata/jhoveConfig.xsd $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhoveConfig.xsd