Selaa lähdekoodia

* Udpate of build job documentation
* changed promote-pom to no parent

benjamin.schwertfeger@googlemail.com 12 vuotta sitten
vanhempi
commit
e92932d5c2

+ 27 - 8
releng/org.yakindu.sct.releng/hudson.README

@@ -2,10 +2,6 @@ To execute this build as a Hudson build job, you have to configure the following
 JobName: YAKINDU_SCT2_CI
 
 Parameterized-build:
-+ Run Parameter
-	Name: base_target_job
-	Project: YAKINDU_Base_target
-	Description: Build from target to use for target repository
 + Run Parameter
 	Name: base_repository_job
 	Project: YAKINDU_Base_CI
@@ -27,11 +23,16 @@ Source-Code-Management:
 + SVN
 	URL: https://svn.codespot.com/a/eclipselabs.org/yakindu/SCT2/trunk/examples
 	Location: sct2_repository/examples
-    
++ SVN
+	URL: http://svn.codespot.com/a/eclipselabs.org/yakindu/BASE/trunk/releng
+	Location: base_repository/releng
+
+Environment:
+	√ Run XVNC during build
+
 Build:
 + Execute Shell
 	Command
-		echo base_target_job: ${base_target_job}
 		echo base_repository_job: ${base_repository_job}
 
 + Execute Shell
@@ -45,6 +46,7 @@ Build:
 		cp -R sct2_repository/features/* build/
 		cp -R sct2_repository/test-plugins/* build/
 		cp -R sct2_repository/examples/* build/
+		cp -R base_repository/releng/* build/
 
 
 + Invoke Maven 3
@@ -60,13 +62,12 @@ Build:
 
 + Invoke Maven 3
 	Goals
-		verify -PCI -s ../build/org.yakindu.sct.releng/settings.xml
+		verify -PCI,Kepler.target -s ../build/org.yakindu.sct.releng/settings.xml
 	POM File
 		../build/org.yakindu.sct.releng/pom.xml
 	Profiles
 		CI
 	Properties
-		p2.target.repository=${env.base_target_job}artifact/update-site
 		p2.base.repository=${env.base_repository_job}artifact/update-site
 	Private Maven-Repository: Checked
 
@@ -93,4 +94,22 @@ Post-Build-Actions:
 + Archive the artifacs
 	Files to archive
 		update-site/**
++ Send files or execute commands over SSH after the build runs
+	Server: Yakindu Projects.itemis.de
+	Command:
+		if [ -e base/kepler/snapshot ]; then 
+		 if [ -e base/kepler/snapshot_backup ]; then
+		  rm -r base/kepler/snapshot_backup;
+		 fi
+		 mv base/kepler/snapshot base/kepler/snapshot_backup;
+		fi
++ Send files or execute commands over SSH after the build runs
+	Server: Yakindu Projects.itemis.de
+	Source files: update-site/**
+	Remove prefix: update-site
+	Remote directory: base/kepler/snapshot
+	Command:
+		if [ -e base/kepler/snapshot -a -e base/kepler/snapshot_backup ]; then
+		 rm -r base/kepler/snapshot_backup;
+		fi
 		

+ 17 - 0
releng/org.yakindu.sct.releng/hudson.promote.README

@@ -9,6 +9,10 @@ Parameterized-build:
 + Selection
 	Name: promotionTarget
 	Selections:
+		kepler/nightly
+		kepler/integration
+		kepler/milestones
+		kepler/releases
 		juno/integration
 		juno/milestones
 		juno/releases
@@ -24,6 +28,19 @@ Parameterized-build:
 		If set to false no existing repository is mirrored before and the existing one is replaced, if there is one.
 		This should only be set to false, if the promotion is to a new repository location.
 
++ Text
+	Name: base_target_job
+	Default: http://download.eclipse.org/releases/kepler
+	Description:
+		Location of repository used for additional features
+
++ Run Parameter
+	Name: base_repository_job
+	Project: YAKINDU_Base_CI
+	Description:
+		Location of base repository used for install base feature
+
+
 Source-Code-Management:
 + SVN
 	URL: http://svn.codespot.com/a/eclipselabs.org/yakindu/SCT2/trunk/releng

+ 9 - 12
releng/org.yakindu.sct.releng/promote-pom.xml

@@ -3,25 +3,23 @@
 	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.yakindu.sct</groupId>
-		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.1.1-SNAPSHOT</version>
-		<relativePath>../org.yakindu.sct.releng/pom.xml</relativePath>
-	</parent>
+	
+	<groupId>org.yakindu.sct</groupId>
 	<artifactId>org.yakindu.sct.releng.promote</artifactId>
-	<packaging>eclipse-repository</packaging>
+	<version>2.1.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<!-- Search for 'target architecture' to find places where the architecture 
 		for distros is set -->
 
 	<properties>
+		<tycho.extras.version>0.18.0</tycho.extras.version>
+
 		<!-- scp settings for publishing udpdate site -->
-		<promotionTarget>indigo/integration</promotionTarget>
+		<promotionTarget>kepler/integration</promotionTarget>
 		<promotionSource>http://builds.itemis.de/urlToCIJob/lastSuccessfulBuild</promotionSource>
 		<updateSiteUrl>http://updates.yakindu.org/${promotionTarget}</updateSiteUrl>
 		<local.update.site>${project.build.directory}/local-update-site</local.update.site>
-		<tycho.extras.version>0.16.0</tycho.extras.version>
 
 		<eclipse.mirror.url>http://mirror.netcologne.de/eclipse</eclipse.mirror.url>
 		<distro.dir>${project.build.directory}/distro</distro.dir>
@@ -30,7 +28,6 @@
 		<profile>epp.package.java</profile>
 		<features>org.eclipse.xtext.sdk.feature.group,org.eclipse.xtend.sdk.feature.group,org.yakindu.sct.sdk.feature.group</features>
 		<update.sites>${p2.target.repository},file:${local.update.site},${updateSiteUrl}</update.sites>
-
 	</properties>
 
 	<build>
@@ -294,7 +291,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-eclipserun-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<version>${tycho.extras.version}</version>
 				<executions>
 					<!-- Add execution per 'target architecture' -->
 					<execution>
@@ -380,7 +377,7 @@
 				<plugin>
 					<groupId>org.eclipse.tycho.extras</groupId>
 					<artifactId>tycho-eclipserun-plugin</artifactId>
-					<version>${tycho-extras-version}</version>
+					<version>${tycho.extras.version}</version>
 					<configuration>
 						<argLine>-Declipse.p2.mirrors=false</argLine>
 						<repositories>