diff options
author | Josef Kopriva | 2017-12-07 15:10:40 +0000 |
---|---|---|
committer | Roland Grunberg | 2017-12-14 19:40:16 +0000 |
commit | a993725549370f09bc6f78f77f115bd6dbc224c8 (patch) | |
tree | 915d97faf9ef3c818b0df747ee26306128ec77e4 | |
parent | fe83dc324ed9f8d95ec8ecd3bdf8d99ebd4d7b07 (diff) | |
download | org.eclipse.linuxtools-a993725549370f09bc6f78f77f115bd6dbc224c8.tar.gz org.eclipse.linuxtools-a993725549370f09bc6f78f77f115bd6dbc224c8.tar.xz org.eclipse.linuxtools-a993725549370f09bc6f78f77f115bd6dbc224c8.zip |
Bug 528271 - Use RedDeer 2.0.1 Final in integration tests for Docker
Tooling and update target platform
Change-Id: I179b29c9a6f0ae788b69e142dadb6b0853709e84
Signed-off-by: Josef Kopriva <jkopriva@redhat.com>
Reviewed-on: https://git.eclipse.org/r/113012
Tested-by: Hudson CI
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
6 files changed, 29 insertions, 28 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF index 4ef6de9574..c03ec861ed 100644 --- a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.linuxtools.docker.integration.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-Vendor: %providerName Require-Bundle: org.junit, org.eclipse.linuxtools.docker.ui;bundle-version="2.1.0", org.eclipse.core.resources, org.eclipse.core.runtime, - org.eclipse.linuxtools.docker.reddeer;bundle-version="2.0.0", - org.eclipse.reddeer.junit.extension;bundle-version="2.0.0", - org.eclipse.reddeer.common;bundle-version="2.0.0", - org.eclipse.reddeer.jface;bundle-version="2.0.0", - org.eclipse.reddeer.core;bundle-version="2.0.0", - org.eclipse.reddeer.eclipse;bundle-version="2.0.0", - org.eclipse.reddeer.ui;bundle-version="2.0.0", - org.eclipse.reddeer.swt;bundle-version="2.0.0", - org.eclipse.reddeer.junit;bundle-version="2.0.0", - org.eclipse.reddeer.requirements;bundle-version="2.0.0", - org.eclipse.reddeer.workbench.core;bundle-version="2.0.0", - org.eclipse.reddeer.workbench;bundle-version="2.0.0", + org.eclipse.linuxtools.docker.reddeer;bundle-version="2.0.1", + org.eclipse.reddeer.junit.extension;bundle-version="2.0.1", + org.eclipse.reddeer.common;bundle-version="2.0.1", + org.eclipse.reddeer.jface;bundle-version="2.0.1", + org.eclipse.reddeer.core;bundle-version="2.0.1", + org.eclipse.reddeer.eclipse;bundle-version="2.0.1", + org.eclipse.reddeer.ui;bundle-version="2.0.1", + org.eclipse.reddeer.swt;bundle-version="2.0.1", + org.eclipse.reddeer.junit;bundle-version="2.0.1", + org.eclipse.reddeer.requirements;bundle-version="2.0.1", + org.eclipse.reddeer.workbench.core;bundle-version="2.0.1", + org.eclipse.reddeer.workbench;bundle-version="2.0.1", org.apache.commons.io, org.apache.commons.lang, org.eclipse.linuxtools.docker.core, diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml index 4a8942b6ba..0ec30251d7 100644 --- a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml +++ b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml @@ -8,7 +8,7 @@ <version>3.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.docker.integration.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java index d7d15e8f93..9c1a0774ef 100644 --- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java +++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java @@ -58,6 +58,7 @@ public class ContainerLogTest extends AbstractImageBotTest { pullImage(IMAGE_NAME); new WaitWhile(new JobIsRunning()); DockerExplorerView explorer = new DockerExplorerView(); + explorer.open(); getConnection().refresh(); getConnection().getImage(IMAGE_NAME).run(); ImageRunSelectionPage firstPage = new ImageRunSelectionPage(explorer); diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF index f34d3f6cb9..5e67cd98cf 100644 --- a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Docker RedDeer Bundle-SymbolicName: org.eclipse.linuxtools.docker.reddeer;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-Activator: org.eclipse.linuxtools.docker.reddeer.Activator Bundle-ActivationPolicy: lazy Bundle-Vendor: Red Hat @@ -12,17 +12,17 @@ Require-Bundle: org.junit, org.eclipse.ui, org.eclipse.osgi, org.eclipse.core.runtime, - org.eclipse.reddeer.eclipse;bundle-version="2.0.0", - org.eclipse.reddeer.common;bundle-version="2.0.0", - org.eclipse.reddeer.swt;bundle-version="2.0.0", - org.eclipse.reddeer.core;bundle-version="2.0.0", - org.eclipse.reddeer.workbench;bundle-version="2.0.0", - org.eclipse.reddeer.jface;bundle-version="2.0.0", + org.eclipse.reddeer.eclipse;bundle-version="2.0.1", + org.eclipse.reddeer.common;bundle-version="2.0.1", + org.eclipse.reddeer.swt;bundle-version="2.0.1", + org.eclipse.reddeer.core;bundle-version="2.0.1", + org.eclipse.reddeer.workbench;bundle-version="2.0.1", + org.eclipse.reddeer.jface;bundle-version="2.0.1", org.apache.commons.lang;bundle-version="2.6.0", org.eclipse.linuxtools.docker.core, org.hamcrest.library;bundle-version="1.3.0", org.hamcrest.core;bundle-version="1.3.0", - org.eclipse.reddeer.workbench.core;bundle-version="2.0.0" + org.eclipse.reddeer.workbench.core;bundle-version="2.0.1" Export-Package: org.eclipse.linuxtools.docker.reddeer.condition, org.eclipse.linuxtools.docker.reddeer.core.ui.wizards, org.eclipse.linuxtools.docker.reddeer.perspective, diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml index 87f13d49f9..26ef6e390d 100644 --- a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml +++ b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml @@ -8,6 +8,6 @@ <version>3.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.linuxtools.docker.reddeer</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target index 61703dbd04..5420857930 100644 --- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="linuxtools-e4.7" sequenceNumber="15"> +<?pde version="3.8"?><target name="linuxtools-e4.7" sequenceNumber="16"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.6.2.v20161117-2150"/> @@ -101,10 +101,10 @@ <repository location="http://download.eclipse.org/releases/oxygen/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="2.0.0.Final"/> -<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="2.0.0.Final"/> -<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="2.0.0.Final"/> -<repository location="http://download.eclipse.org/reddeer/releases/2.0.0"/> +<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="2.0.1.Final"/> +<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="2.0.1.Final"/> +<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="2.0.1.Final"/> +<repository location="http://download.eclipse.org/reddeer/releases/2.0.1"/> </location> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> |