You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/11 08:26:11 UTC
[1/5] archiva git commit: Fixing issues on ciserver
Repository: archiva
Updated Branches:
refs/heads/citest 058854ea7 -> c4e7c0735
Fixing issues on ciserver
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/abab994f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/abab994f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/abab994f
Branch: refs/heads/citest
Commit: abab994f71a2654e2e4acf577d3c4a356a7c6817
Parents: edb7bd3
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sat Jun 10 13:30:04 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sat Jun 10 21:07:39 2017 +0200
----------------------------------------------------------------------
.../archiva-web/archiva-webapp-test/pom.xml | 8 +++++---
.../apache/archiva/web/test/ArchivaAdminTest.java | 17 +++++++++++++++++
.../archiva/web/test/RepositoryAdminTest.java | 2 +-
.../archiva/web/test/WebDriverBrowseTest.java | 3 +++
.../org/apache/archiva/web/test/WebDriverTest.java | 6 ++++++
5 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/abab994f/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 40eb946..868f2f5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -819,13 +819,15 @@
<executions>
<execution>
<id>cleanup-files</id>
+ <phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <delete file="${user.home}/.m2/archiva.xml" quiet="true"/>
- </tasks>
+ <failOnError>false</failOnError>
+ <target>
+ <delete file="${user.home}/.m2/archiva.xml" />
+ </target>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/archiva/blob/abab994f/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/ArchivaAdminTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/ArchivaAdminTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/ArchivaAdminTest.java
index 3e177b2..3780558 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/ArchivaAdminTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/ArchivaAdminTest.java
@@ -21,6 +21,8 @@ package org.apache.archiva.web.test;
import org.apache.archiva.web.test.parent.AbstractArchivaTest;
import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
@@ -35,4 +37,19 @@ public class ArchivaAdminTest
WebDriverWait wait = new WebDriverWait(getWebDriver(), 30);
wait.until(ExpectedConditions.titleContains("Apache Archiva"));
}
+
+ @Test
+ public void testInitialRepositories()
+ {
+ WebDriverWait wait = new WebDriverWait(getWebDriver(), 20);
+ WebElement el;
+ el = wait.until(ExpectedConditions.elementToBeClickable( By.id("menu-repositories-list-a")));
+ tryClick( el, ExpectedConditions.presenceOfElementLocated( By.xpath("//table[@id='managed-repositories-table']//td[contains(text(),'internal')]") ),
+ "Managed Repositories not activated");
+ wait.until(ExpectedConditions.visibilityOfElementLocated( By.xpath("//table[@id='managed-repositories-table']//td[contains(text(),'snapshots')]") ));
+ el = wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#remote-repositories-content']")));
+ tryClick(el,ExpectedConditions.visibilityOfElementLocated(By.xpath("//table[@id='remote-repositories-table']//td[contains(text(),'central')]")),
+ "Remote Repositories View not available");
+
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/abab994f/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RepositoryAdminTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RepositoryAdminTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RepositoryAdminTest.java
index c1eccfa..7b034aa 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RepositoryAdminTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RepositoryAdminTest.java
@@ -47,7 +47,7 @@ public class RepositoryAdminTest
@Test
public void testManagedRepository()
{
- login( getAdminUsername(), getAdminPassword() );
+ // login( getAdminUsername(), getAdminPassword() );
WebDriverWait wait = new WebDriverWait(getWebDriver(), 20);
WebElement el;
el = wait.until(ExpectedConditions.elementToBeClickable(By.id("menu-repositories-list-a")));
http://git-wip-us.apache.org/repos/asf/archiva/blob/abab994f/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
index 17b9015..e8cd493 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
@@ -102,6 +102,9 @@ public class WebDriverBrowseTest
// wait until topbar-menu-container is feeded
await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
+ await().atMost( 10, TimeUnit.SECONDS).untilPredicate( (fl) -> el("#create-admin-link-a").conditions().clickable() ||
+ el("#login-link-a").conditions().clickable()
+ );
FluentList<FluentWebElement> elements = find( "#create-admin-link-a" );
if ( !elements.isEmpty() && elements.get( 0 ).displayed() )
http://git-wip-us.apache.org/repos/asf/archiva/blob/abab994f/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
index 0cdce65..35e26b3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
@@ -42,6 +42,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
/**
* @author Olivier Lamy
@@ -89,6 +90,11 @@ public class WebDriverTest
// wait until topbar-menu-container is feeded
//await().atMost(20, TimeUnit.SECONDS).until($("#topbar-menu")).present();
await().untilPredicate((fl) ->$("#topbar-menu").present());
+ await().atMost( 10, TimeUnit.SECONDS).untilPredicate( ( fl) -> el("#create-admin-link-a").conditions().clickable() ||
+ el("#login-link-a").conditions().clickable()
+ );
+
+
FluentList<FluentWebElement> elements = find("#create-admin-link-a");
if (!elements.isEmpty() && elements.get(0).displayed()) {
[4/5] archiva git commit: Adding selenium driver update script
Posted by ma...@apache.org.
Adding selenium driver update script
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/8a44972c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/8a44972c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/8a44972c
Branch: refs/heads/citest
Commit: 8a44972c6412d43c7e25c5c0ad39a4252d575206
Parents: f62d5f7
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Jun 11 10:21:28 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Jun 11 10:21:28 2017 +0200
----------------------------------------------------------------------
src/ci/scripts/updateSeleniumDriver.ps1 | 83 ++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a44972c/src/ci/scripts/updateSeleniumDriver.ps1
----------------------------------------------------------------------
diff --git a/src/ci/scripts/updateSeleniumDriver.ps1 b/src/ci/scripts/updateSeleniumDriver.ps1
new file mode 100644
index 0000000..9ca6608
--- /dev/null
+++ b/src/ci/scripts/updateSeleniumDriver.ps1
@@ -0,0 +1,83 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# Powershell script updating Selenium drivers on ci server
+#
+# Author: Martin Stockhammer <ma...@apache.org>
+# Date : 2017-05-14
+#
+# Description:
+# This script checks, if the selenium drivers are available on the system and downloads
+# and extracts them, if they do not exist.
+#
+# Parameter:
+# -Verbose: Print additional output
+# -Force: Remove the existing drivers and download/extract them again
+
+
+param (
+ [switch]$Verbose = $False,
+ [switch]$Force = $False
+)
+
+$psVersion = $PSVersionTable.PSVersion
+$baseDir = "F:\jenkins\tools"
+
+if ($Verbose) {
+ Write-Output "PS-Version: $psVersion"
+ Write-Output "Verbose: $Verbose, Force: $Force"
+}
+
+$urls = @{
+ "iedriver\2.53.1\win64\DriverServer.zip"="http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_x64_2.53.1.zip"
+ "iedriver\2.53.1\win32\DriverServer.zip"="http://selenium-release.storage.googleapis.com/2.53/IEDriverServer_Win32_2.53.1.zip"
+ "iedriver\3.4.0\win64\DriverServer.zip"="http://selenium-release.storage.googleapis.com/3.4/IEDriverServer_x64_3.4.0.zip"
+ "iedriver\3.4.0\win32\DriverServer.zip"="http://selenium-release.storage.googleapis.com/3.4/IEDriverServer_Win32_3.4.0.zip"
+ "chromedriver\2.29\win32\DriverServer.zip"="http://chromedriver.storage.googleapis.com/2.29/chromedriver_win32.zip"
+ "geckodriver\0.16.1\win32\DriverServer.zip"="http://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-win32.zip"
+ "geckodriver\0.16.1\win64\DriverServer.zip"="http://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-win64.zip"
+}
+
+foreach ($h in $urls.GetEnumerator()) {
+ $url = $h.Value
+ $downloadFile = "$($baseDir)\$($h.Name)"
+ $downloadDir = Split-Path $downloadFile -Parent
+
+ if ($Force -And (Test-Path -Path $downloadDir ) ) {
+ Get-ChildItem -Path $downloadDir -Recurse | Remove-Item -force -recurse
+ }
+
+ if(!(Test-Path -Path $downloadDir )){
+ New-Item -ItemType directory -Path $downloadDir
+ }
+
+ if ($Force -Or !(Test-Path -Path $downloadFile )){
+ Write-Output "Downloading Driver $url"
+ Invoke-WebRequest -Uri $url -OutFile $downloadFile
+
+ $shell = New-Object -ComObject shell.application
+ $zip = $shell.NameSpace($downloadFile)
+ foreach ($item in $zip.items()) {
+ $shell.Namespace($downloadDir).CopyHere($item)
+ }
+ if ($Verbose) {
+ Get-ChildItem -Path $downloadDir
+ }
+ }
+}
\ No newline at end of file
[5/5] archiva git commit: Sync with master
Posted by ma...@apache.org.
Sync with master
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c4e7c073
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c4e7c073
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c4e7c073
Branch: refs/heads/citest
Commit: c4e7c0735831b110dcde1e5cfca6e6abc0d18b0c
Parents: 8a44972 058854e
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Jun 11 10:25:05 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Jun 11 10:25:05 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/5] archiva git commit: Adding cleanup of indexer directories
Posted by ma...@apache.org.
Adding cleanup of indexer directories
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6a789cd7
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6a789cd7
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6a789cd7
Branch: refs/heads/citest
Commit: 6a789cd7aee2d24c02a925853b058530a98e5ad1
Parents: abab994
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Jun 11 00:14:01 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Jun 11 00:14:01 2017 +0200
----------------------------------------------------------------------
src/ci/scripts/prepareWorkspace.sh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6a789cd7/src/ci/scripts/prepareWorkspace.sh
----------------------------------------------------------------------
diff --git a/src/ci/scripts/prepareWorkspace.sh b/src/ci/scripts/prepareWorkspace.sh
index 725f3e3..45f857c 100644
--- a/src/ci/scripts/prepareWorkspace.sh
+++ b/src/ci/scripts/prepareWorkspace.sh
@@ -23,6 +23,7 @@
# Removes directories that are not used anymore.
##
ATTIC_DIRS=""
+REMOVE_DIRS=".indexer"
for i in ${ATTIC_DIRS}; do
if [ "X${i}" != "X" -a -d ${i} ]; then
@@ -30,3 +31,7 @@ for i in ${ATTIC_DIRS}; do
rm -rf ${i}
fi
done
+
+for i in ${REMOVE_DIRS}; do
+ find . -type d -name "${i}" -exec rm -rf {} \;
+done
[3/5] archiva git commit: Improve workspace cleanup
Posted by ma...@apache.org.
Improve workspace cleanup
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f62d5f78
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f62d5f78
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f62d5f78
Branch: refs/heads/citest
Commit: f62d5f78cb99103f60bec87b49e7a74c09b7c75a
Parents: 6a789cd
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Jun 11 00:22:28 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Jun 11 00:22:28 2017 +0200
----------------------------------------------------------------------
src/ci/scripts/prepareWorkspace.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/f62d5f78/src/ci/scripts/prepareWorkspace.sh
----------------------------------------------------------------------
diff --git a/src/ci/scripts/prepareWorkspace.sh b/src/ci/scripts/prepareWorkspace.sh
index 45f857c..c9d1d8d 100644
--- a/src/ci/scripts/prepareWorkspace.sh
+++ b/src/ci/scripts/prepareWorkspace.sh
@@ -33,5 +33,5 @@ for i in ${ATTIC_DIRS}; do
done
for i in ${REMOVE_DIRS}; do
- find . -type d -name "${i}" -exec rm -rf {} \;
+ find . -type d -name "${i}" -print0 | xargs -0 rm -rvf
done