Bug 515136 - Add new Docker Tests feature
- add a new feature for Docker Tooling tests
- include new docker reddeer plug-in
Change-Id: Iadfa2088c3fa0bf8fe1903d8ab8a26c7110e3dd2
Reviewed-on: https://git.eclipse.org/r/95031
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.project b/containers/org.eclipse.linuxtools.docker.tests-feature/.project
new file mode 100644
index 0000000..d176de8
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.linuxtools.docker-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties b/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties
new file mode 100644
index 0000000..155886c
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties
@@ -0,0 +1,8 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ p2.inf
+src.includes = feature.xml,\
+ feature.properties,\
+ build.properties,\
+ .classpath,\
+ .project
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties
new file mode 100644
index 0000000..39aac07
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties
@@ -0,0 +1,10 @@
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+featureProvider=Eclipse Linux Tools
+featureName=Docker Tooling Tests
+featureDescription=The Docker Tooling Tests feature provides test-suite plug-ins for testing the Eclipse Docker Tooling plug-ins.
+copyright=Copyright 2014, 2015 Red Hat, Inc.
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
new file mode 100644
index 0000000..15cf895
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.linuxtools.docker.tests.feature"
+ label="%featureName"
+ version="3.0.0.qualifier"
+ provider-name="%featureProvider"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description url="http://www.eclipse.org/linuxtools">
+ %featureDescription
+ </description>
+
+ <copyright url="http://www.redhat.com">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="Linux Tools Docker Update Site" url="http://download.eclipse.org/linuxtools/update-docker"/>
+ </url>
+
+ <requires>
+ <import feature="org.eclipse.linuxtools.docker.feature" version="3.0.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.linuxtools.docker.reddeer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.linuxtools.docker.integration.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.linuxtools.docker.ui.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.linuxtools.docker.tests.hamcrest-wrap"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf b/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf
new file mode 100644
index 0000000..7bc97f0
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:0,name:Linux Tools Docker Tooling,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:1,name:Linux Tools Docker Tooling,enabled:false);
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
new file mode 100644
index 0000000..ec8938a
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2014, 2015, Red Hat, Inc.
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.linuxtools</groupId>
+ <artifactId>org.eclipse.linuxtools.docker</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.linuxtools.docker.tests.feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <name>Linux Tools Docker Tooling Test Feature</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/containers/pom.xml b/containers/pom.xml
index 4208069..45fa9da 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -32,6 +32,7 @@
<module>org.eclipse.linuxtools.docker-feature</module>
<module>org.eclipse.linuxtools.docker.reddeer</module>
<module>org.eclipse.linuxtools.docker.integration.tests</module>
+ <module>org.eclipse.linuxtools.docker.tests-feature</module>
</modules>
<build>
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index 4f0e8c9..1531e4a 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -7,12 +7,18 @@
<feature url="features/org.eclipse.linuxtools.docker.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
+ <feature url="features/org.eclipse.linuxtools.docker.tests.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.tests.feature" version="0.0.0">
+ <category name="Linux Tools"/>
+ </feature>
<feature url="features/org.eclipse.linuxtools.vagrant.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.vagrant.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
<feature url="features/org.eclipse.linuxtools.docker.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.feature.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
+ <feature url="features/org.eclipse.linuxtools.docker.tests.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.tests.feature.source" version="0.0.0">
+ <category name="Linux Tools"/>
+ </feature>
<feature url="features/org.eclipse.linuxtools.vagrant.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.vagrant.feature.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
