From e95701dec04de03b7440c30cd2cae8a79b3ccd33 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Wed, 22 May 2024 19:58:34 +0300
Subject: [PATCH] [#1361] Rework ci jobs to support stable P2 repository
 structure

Switch to standardized publishing
---
 Jenkinsfile                                   |  62 +++++-
 pom.xml                                       |   1 +
 releng/org.eclipse.passage.parent/pom.xml     |  36 +---
 .../category.xml                              | 183 ++++++++++++++++++
 sites/org.eclipse.passage.repository/pom.xml  | 136 +++++++++++++
 5 files changed, 384 insertions(+), 34 deletions(-)
 create mode 100644 sites/org.eclipse.passage.repository/category.xml
 create mode 100644 sites/org.eclipse.passage.repository/pom.xml

diff --git a/Jenkinsfile b/Jenkinsfile
index 9193e9526..c69f9fc40 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,11 +11,67 @@ pipeline {
 		maven 'apache-maven-latest'
 		jdk 'openjdk-jdk17-latest'
 	}
+	parameters {
+		choice(
+			name: 'BUILD_TYPE',
+			choices: ['nightly', 'milestone', 'release'],
+			description: '''
+			Choose the type of build.
+			Note that a release build will not promote the build, but rather will promote the most recent milestone build.
+			'''
+		)
+		booleanParam(
+			name: 'PROMOTE',
+			defaultValue: true,
+			description: 'Whether to promote the build to the download server.'
+		)
+	}
 	stages {
-		stage('Build') {
+		stage('Display Parameters') {
+				steps {
+						echo "BUILD_TYPE=${params.BUILD_TYPE}"
+						echo "PROMOTE=${params.PROMOTE}"
+						script {
+								env.BUILD_TYPE = params.BUILD_TYPE
+								if (env.BRANCH_NAME == 'main') {
+									if (params.PROMOTE) {
+										env.MAVEN_PROFILES = "-Psign -Ppromote"
+									} else {
+										env.MAVEN_PROFILES = "-Psign"
+									}
+								} else {
+									env.MAVEN_PROFILES = "-P baseline-check,coverage"
+								}
+						}
+				}
+		}
+		stage('Initialize PGP') {
+			steps {
+				withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
+					sh 'gpg --batch --import "${KEYRING}"'
+					sh 'for fpr in $(gpg --list-keys --with-colons  | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" |  gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done'
+				}
+			}
+		}
+		stage('Build Passage') {
 			steps {
-				wrap([$class: 'Xvnc', useXauthority: true]) {
-					sh 'mvn clean verify -B -P baseline-check,coverage -Dmaven.repo.local=$WORKSPACE/.m2/repository -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true -Ddash.fail=false'
+				sshagent (['projects-storage.eclipse.org-bot-ssh']) {
+					wrap([$class: 'Xvnc', useXauthority: true]) {
+						sh '''
+							mvn \
+							clean \
+							verify \
+							-B \
+							$MAVEN_PROFILES \
+							-Dmaven.repo.local=$WORKSPACE/.m2/repository \
+							-Dmaven.test.failure.ignore=true \
+							-Dmaven.test.error.ignore=true \
+							-Ddash.fail=false \
+							-Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
+							-Dbuild.type=$BUILD_TYPE \
+							-Dgit.commit=$GIT_COMMIT
+						'''
+					}
 				}
 			}
 			post {
diff --git a/pom.xml b/pom.xml
index 25be2ed3d..41a503536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
 		<module>./releng/org.eclipse.passage.lbc.aggregator</module>
 		<module>./releng/org.eclipse.passage.ldc.aggregator</module>
 		<module>./releng/org.eclipse.passage.demo.aggregator</module>
+		<module>sites</module>
 	</modules>
 
 </project>
diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
index 378edf105..11a32fd02 100644
--- a/releng/org.eclipse.passage.parent/pom.xml
+++ b/releng/org.eclipse.passage.parent/pom.xml
@@ -408,22 +408,9 @@
 		</profile>
 
 		<profile>
-			<id>production</id>
-			<activation>
-				<property>
-					<name>PACK_AND_SIGN</name>
-					<value>true</value>
-				</property>
-			</activation>
+			<id>sign</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<configuration>
-							<includePackedArtifacts>true</includePackedArtifacts>
-						</configuration>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -431,28 +418,15 @@
 						<executions>
 							<execution>
 								<id>sign</id>
+								<!-- Eclipse jar-signing must occur before GPG
+								signing. Bind this plugin execution to a phase
+								just prior to to the GPG plugin execution. -->
+								<phase>post-integration-test</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
-								<phase>verify</phase>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>p2-metadata</id>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-								<phase>verify</phase>
 							</execution>
 						</executions>
-						<configuration>
-							<defaultP2Metadata>false</defaultP2Metadata>
-						</configuration>
 					</plugin>
 				</plugins>
 			</build>
diff --git a/sites/org.eclipse.passage.repository/category.xml b/sites/org.eclipse.passage.repository/category.xml
new file mode 100644
index 000000000..c15538025
--- /dev/null
+++ b/sites/org.eclipse.passage.repository/category.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019, 2024 ArSysOp and others
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License 2.0 which is available at
+ https://www.eclipse.org/legal/epl-2.0/.
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+     ArSysOp - initial API and implementation
+-->
+<site>
+	<category-def
+		name="org.eclipse.passage.lic.category"
+		label="Passage LIC"
+	>
+		<description>
+			Passage Licensing Integration Components includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
+		</description>
+	</category-def>
+	<feature
+		id="org.eclipse.passage.lic.compile.feature">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.execute.feature">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.define.feature">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.bc.feature">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.jetty.feature">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+
+	<category-def
+		name="org.eclipse.passage.lic.category.source"
+		label="Passage LIC Developer Resources"
+	>
+		<description>
+			Passage Licensing Integration Components Developer Resources includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
+		</description>
+	</category-def>
+	<feature
+		id="org.eclipse.passage.lic.compile.feature.source">
+		<category name="org.eclipse.passage.lic.category.source" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.execute.feature.source">
+		<category name="org.eclipse.passage.lic.category.source" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.define.feature.source">
+		<category name="org.eclipse.passage.lic.category.source" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.bc.feature.source">
+		<category name="org.eclipse.passage.lic.category.source" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.lic.jetty.feature.source">
+		<category name="org.eclipse.passage.lic.category.source" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.lbc.category"
+		label="Passage LBC">
+		<description>
+			Passage Licensing Back-end Components: 
+				OSGi-based server to manage licensing data" 
+		</description>
+	</category-def>
+	<feature 
+		id="org.eclipse.passage.lbc.execute.feature">
+		<category name="org.eclipse.passage.lbc.category" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.lbc.category.source"
+		label="Passage LBC Developer Resources">
+		<description>
+			Passage Licensing Back-end Components Developer Resources: 
+				OSGi-based server to manage licensing data" 
+		</description>
+	</category-def>
+	<feature 
+		id="org.eclipse.passage.lbc.execute.feature.source">
+		<category name="org.eclipse.passage.lbc.category.source" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.ldc.category"
+		label="Passage LDC">
+		<description>
+			Passage Licensing Definition Components: 
+				Eclipse PDE integration" 
+		</description>
+	</category-def>
+	<feature 
+		id="org.eclipse.passage.ldc.feature">
+		<category name="org.eclipse.passage.ldc.category" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.ldc.category.source"
+		label="Passage LDC Developer Resources">
+		<description>
+			Passage Licensing Definition Components Developer Resources: 
+				Eclipse PDE integration" 
+		</description>
+	</category-def>
+	<feature 
+		id="org.eclipse.passage.ldc.feature.source">
+		<category name="org.eclipse.passage.ldc.category.source" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.loc.category"
+		label="Passage LOC">
+		<description>
+			Passage Licensing Operator Components includes: Dashboard, EMF Forms editors, operator services
+		</description>
+	</category-def>
+	<feature
+		id="org.eclipse.passage.loc.dashboard.feature">
+		<category name="org.eclipse.passage.loc.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.loc.operator.feature">
+		<category name="org.eclipse.passage.loc.category" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.loc.billing.feature">
+		<category name="org.eclipse.passage.loc.category" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.loc.category.source"
+		label="Passage LOC Developer Resources">
+		<description>
+			Passage Licensing Operator Components Developer Resources includes: Dashboard, EMF Forms editors, operator services
+		</description>
+	</category-def>
+	<feature
+		id="org.eclipse.passage.loc.dashboard.feature.source">
+		<category name="org.eclipse.passage.loc.category.source" />
+	</feature>
+	<feature
+		id="org.eclipse.passage.loc.operator.feature.source">
+		<category name="org.eclipse.passage.loc.category.source" />
+	</feature>
+	<bundle id="bcpg" />
+	<bundle id="bcpg.source" />
+	<bundle id="bcpkix" />
+	<bundle id="bcpkix.source" />
+	<bundle id="bcprov" />
+	<bundle id="bcprov.source" />
+	<bundle id="bcutil" />
+	<bundle id="bcutil.source" />
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
+	<bundle id="com.github.oshi.oshi-core" />
+	<bundle id="com.github.oshi.oshi-core.source" />
+	<bundle id="com.sun.jna" />
+	<bundle id="com.sun.jna.source" />
+	<bundle id="com.sun.jna.platform" />
+	<bundle id="com.sun.jna.platform.source" />
+	<bundle id="jakarta.activation-api" />
+	<bundle id="jakarta.activation-api.source" />
+	<bundle id="jakarta.annotation-api" />
+	<bundle id="jakarta.annotation-api.source" />
+	<bundle id="jakarta.servlet-api" />
+	<bundle id="jakarta.servlet-api.source" />
+	<bundle id="slf4j.api" />
+	<bundle id="slf4j.api.source" />
+	<bundle id="slf4j.nop" />
+	<bundle id="slf4j.nop.source" />
+</site>
diff --git a/sites/org.eclipse.passage.repository/pom.xml b/sites/org.eclipse.passage.repository/pom.xml
new file mode 100644
index 000000000..c514bdab1
--- /dev/null
+++ b/sites/org.eclipse.passage.repository/pom.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018, 2024 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>Eclipse Passage Update Site</name>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.parent</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
+	</parent>
+
+	<properties>
+		<eclipse.repo>https://download.eclipse.org/releases/2023-06</eclipse.repo>
+		<justj.tools.repo>
+			https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo>
+		<org.eclipse.storage.user>genie.passage</org.eclipse.storage.user>
+		<org.eclipse.justj.p2.manager.args>
+			-remote
+			${org.eclipse.storage.user}@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/passage</org.eclipse.justj.p2.manager.args>
+		<org.eclipse.justj.p2.manager.extra.args></org.eclipse.justj.p2.manager.extra.args>
+		<org.eclipse.justj.p2.manager.relative>updates</org.eclipse.justj.p2.manager.relative>
+		<org.eclipse.justj.p2.manager.build.url>http://www.example.com/</org.eclipse.justj.p2.manager.build.url>
+		<git.commit>unknown</git.commit>
+		<build.type>nightly</build.type>
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>promote</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<executionEnvironment>JavaSE-17</executionEnvironment>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.justj.p2</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.felix.scr</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+							<repositories>
+								<repository>
+									<id>eclipse.repo</id>
+									<layout>p2</layout>
+									<url>${eclipse.repo}</url>
+								</repository>
+								<repository>
+									<id>justj.tools.repo</id>
+									<layout>p2</layout>
+									<url>${justj.tools.repo}</url>
+								</repository>
+							</repositories>
+						</configuration>
+						<executions>
+							<execution>
+								<id>promote</id>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>package</phase>
+								<configuration>
+									<argLine></argLine>
+									<appArgLine>
+										-consoleLog
+										-application
+										org.eclipse.justj.p2.manager
+										-data @None
+										-nosplash
+										${org.eclipse.justj.p2.manager.args}
+										-retain 5
+										-label "Passage"
+										-build-url
+										${org.eclipse.justj.p2.manager.build.url}
+										-root
+										${project.build.directory}/passage-sync
+										-relative
+										${org.eclipse.justj.p2.manager.relative}
+										-version-iu
+										org.eclipse.passage.ldc.feature.
+										-iu-filter-pattern
+										org.eclipse.passage.nothingtofilter.*|org.eclipse.passage.justtohaveanexample.*
+										-excluded-categories-pattern .*\.Default
+										-commit
+										https://github.com/eclipse-passage/passage/commit/${git.commit}
+										-target-url
+										https://download.eclipse.org/passage
+										-promote
+										${project.build.directory}/repository
+										-timestamp ${build.timestamp}
+										-type ${build.type}
+										-breadcrumb "Passage
+										https://www.eclipse.org/passage"
+										-favicon
+										https://github.com/eclipse-passage/passage-images/blob/master/images/org.eclipse.passage.loc.operator/png/icons/48.png
+										-xtitle-image
+										https://www.eclipse.org/jetty/common/images/jetty-logo.svg
+										-body-image
+										https://github.com/eclipse-passage/passage-images/blob/master/images/org.eclipse.passage.loc.operator/png/icons/128.png
+										${org.eclipse.justj.p2.manager.extra.args}
+									</appArgLine>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>
\ No newline at end of file