Skip to content

Commit 5d52953

Browse files
jbureljburel
authored
Merge pull request #221 from dominikl/ozbp
Add omero-zarr-pixel-buffer build
2 parents 9392206 + 8063193 commit 5d52953

4 files changed

Lines changed: 114 additions & 1 deletion

File tree

‎home/jobs/OMERO-server/config.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@ rm -rf $WORKSPACE/* # Should leave .venv3</command>
9595
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
9696
<flatten>true</flatten>
9797
<doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
98+
</hudson.plugins.copyartifact.CopyArtifact>
99+
<hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@770.va_6c69e063442">
100+
<project>OMERO-zarr-pixel-buffer-build</project>
101+
<filter></filter>
102+
<target></target>
103+
<includeBuildNumberInTargetPath>false</includeBuildNumberInTargetPath>
104+
<excludes></excludes>
105+
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
106+
<flatten>true</flatten>
107+
<doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
98108
</hudson.plugins.copyartifact.CopyArtifact>
99109
<hudson.tasks.Shell>
100110
<command>
@@ -121,6 +131,18 @@ unzip $ZIP
121131
rm -f $ZIP
122132
mv $WORKSPACE/$DIST $OMERO_DIST
123133

134+
# Install omero-zarr-pixel-buffer
135+
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/com/github/ben-manes/caffeine/caffeine/3.1.8/caffeine-3.1.8.jar
136+
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/dev/zarr/jzarr/0.4.2/jzarr-0.4.2.jar
137+
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/org/lasersonlab/s3fs/2.2.3/s3fs-2.2.3.jar
138+
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/com/amazonaws/aws-java-sdk-s3/1.12.659/aws-java-sdk-s3-1.12.659.jar
139+
wget -P $OMERO_DIST/lib/server https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-core/1.12.659/aws-java-sdk-core-1.12.659.jar
140+
141+
# Install the jar from OMERO-zarr-pixel-buffer-build job
142+
for x in *.jar; do
143+
mv $x $OMERO_DIST/lib/server
144+
done
145+
124146
source $WORKSPACE/.venv3/bin/activate
125147

126148
pip install -U pip
@@ -187,4 +209,4 @@ deactivate
187209
<buildWrappers>
188210
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.26"/>
189211
</buildWrappers>
190-
</project>
212+
</project>

‎home/jobs/OMERO-zarr-pixel-buffer-build/config.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version='1.1' encoding='UTF-8'?>
2+
<project>
3+
<actions/>
4+
<description></description>
5+
<keepDependencies>false</keepDependencies>
6+
<properties/>
7+
<scm class="hudson.scm.NullSCM"/>
8+
<assignedNode>testintegration</assignedNode>
9+
<canRoam>false</canRoam>
10+
<disabled>false</disabled>
11+
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
12+
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
13+
<triggers/>
14+
<concurrentBuild>false</concurrentBuild>
15+
<builders>
16+
<hudson.tasks.Shell>
17+
<command>rm -rf omero-zarr-pixel-buffer
18+
git clone -b $MERGE_PUSH_BRANCH https://github.com/$SPACE_USER/omero-zarr-pixel-buffer.git
19+
cd omero-zarr-pixel-buffer
20+
./gradlew publishToMavenLocal</command>
21+
<configuredLocalRules/>
22+
</hudson.tasks.Shell>
23+
</builders>
24+
<publishers>
25+
<hudson.tasks.ArtifactArchiver>
26+
<artifacts>**/build/libs/*.jar</artifacts>
27+
<allowEmptyArchive>false</allowEmptyArchive>
28+
<onlyIfSuccessful>false</onlyIfSuccessful>
29+
<fingerprint>false</fingerprint>
30+
<defaultExcludes>true</defaultExcludes>
31+
<caseSensitive>true</caseSensitive>
32+
<followSymlinks>false</followSymlinks>
33+
</hudson.tasks.ArtifactArchiver>
34+
</publishers>
35+
<buildWrappers/>
36+
</project>

‎home/jobs/OMERO-zarr-pixel-buffer-push/config.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version='1.1' encoding='UTF-8'?>
2+
<flow-definition plugin="workflow-job@1385.vb_58b_86ea_fff1">
3+
<actions/>
4+
<description>Run scc merge and bump versions on omero-zarr-pixel-buffer</description>
5+
<keepDependencies>false</keepDependencies>
6+
<properties>
7+
<hudson.model.ParametersDefinitionProperty>
8+
<parameterDefinitions>
9+
<hudson.model.ChoiceParameterDefinition>
10+
<name>STATUS</name>
11+
<description>PR check status</description>
12+
<choices class="java.util.Arrays$ArrayList">
13+
<a class="string-array">
14+
<string>success-only</string>
15+
<string>no-error</string>
16+
<string>none</string>
17+
</a>
18+
</choices>
19+
</hudson.model.ChoiceParameterDefinition>
20+
<hudson.model.StringParameterDefinition>
21+
<name>MERGE_OPTIONS</name>
22+
<description>scc merge options</description>
23+
<defaultValue>-vvv --no-ask --reset --comment</defaultValue>
24+
<trim>false</trim>
25+
</hudson.model.StringParameterDefinition>
26+
</parameterDefinitions>
27+
</hudson.model.ParametersDefinitionProperty>
28+
</properties>
29+
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@3964.v0767b_4b_a_0b_fa_">
30+
<script>node(&apos;testintegration&apos;) {
31+
32+
library identifier: &apos;recursiveMerge@master&apos;, retriever: modernSCM(
33+
[$class: &apos;GitSCMSource&apos;,
34+
remote: &apos;https://github.com/ome/jenkins-library-recursivemerge.git&apos;])
35+
36+
recursiveCheckout(
37+
repo: &apos;omero-zarr-pixel-buffer.git&apos;)
38+
39+
recursiveMerge(
40+
baseRepo: &apos;omero-zarr-pixel-buffer.git&apos;)
41+
42+
}</script>
43+
<sandbox>true</sandbox>
44+
</definition>
45+
<triggers/>
46+
<disabled>false</disabled>
47+
</flow-definition>

‎home/jobs/Trigger/config.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@
6969
}
7070
}
7171

72+
stage(&apos;OMERO zarr-pixel-buffer&apos;) {
73+
steps {
74+
build job: &apos;OMERO-zarr-pixel-buffer-push&apos;
75+
build job: &apos;OMERO-zarr-pixel-buffer-build&apos;
76+
}
77+
}
78+
7279
stage(&quot;OMERO Python&quot;) {
7380
steps {
7481
build job: &apos;OMERO-python-superbuild-push&apos;, parameters: [string(name: &apos;STATUS&apos;, value: &quot;${params.STATUS}&quot;)]
@@ -126,6 +133,7 @@
126133
build job: &apos;WEBSITE-push&apos;, wait: false
127134
}
128135
}
136+
129137
}
130138
}</script>
131139
<sandbox>true</sandbox>

0 commit comments

Comments
 (0)