Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion home/jobs/OMERO-server/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ rm -rf $WORKSPACE/* # Should leave .venv3</command>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<flatten>true</flatten>
<doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.copyartifact.CopyArtifact plugin="[email protected]_6c69e063442">
<project>OMERO-zarr-pixel-buffer-build</project>
<filter></filter>
<target></target>
<includeBuildNumberInTargetPath>false</includeBuildNumberInTargetPath>
<excludes></excludes>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<flatten>true</flatten>
<doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.tasks.Shell>
<command>
Expand All @@ -121,6 +131,18 @@ unzip $ZIP
rm -f $ZIP
mv $WORKSPACE/$DIST $OMERO_DIST

# Install omero-zarr-pixel-buffer
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
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/dev/zarr/jzarr/0.4.2/jzarr-0.4.2.jar
wget -P $OMERO_DIST/lib/server https://repo.maven.apache.org/maven2/org/lasersonlab/s3fs/2.2.3/s3fs-2.2.3.jar
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
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

# Install the jar from OMERO-zarr-pixel-buffer-build job
for x in *.jar; do
mv $x $OMERO_DIST/lib/server
done

source $WORKSPACE/.venv3/bin/activate

pip install -U pip
Expand Down Expand Up @@ -187,4 +209,4 @@ deactivate
<buildWrappers>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="[email protected]"/>
</buildWrappers>
</project>
</project>
36 changes: 36 additions & 0 deletions home/jobs/OMERO-zarr-pixel-buffer-build/config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version='1.1' encoding='UTF-8'?>
<project>
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties/>
<scm class="hudson.scm.NullSCM"/>
<assignedNode>testintegration</assignedNode>
<canRoam>false</canRoam>
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>rm -rf omero-zarr-pixel-buffer
git clone -b $MERGE_PUSH_BRANCH https://github.com/$SPACE_USER/omero-zarr-pixel-buffer.git
cd omero-zarr-pixel-buffer
./gradlew publishToMavenLocal</command>
<configuredLocalRules/>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>**/build/libs/*.jar</artifacts>
<allowEmptyArchive>false</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
<defaultExcludes>true</defaultExcludes>
<caseSensitive>true</caseSensitive>
<followSymlinks>false</followSymlinks>
</hudson.tasks.ArtifactArchiver>
</publishers>
<buildWrappers/>
</project>
47 changes: 47 additions & 0 deletions home/jobs/OMERO-zarr-pixel-buffer-push/config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version='1.1' encoding='UTF-8'?>
<flow-definition plugin="[email protected]_58b_86ea_fff1">
<actions/>
<description>Run scc merge and bump versions on omero-zarr-pixel-buffer</description>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.ChoiceParameterDefinition>
<name>STATUS</name>
<description>PR check status</description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>success-only</string>
<string>no-error</string>
<string>none</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>MERGE_OPTIONS</name>
<description>scc merge options</description>
<defaultValue>-vvv --no-ask --reset --comment</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="[email protected]_4b_a_0b_fa_">
<script>node(&apos;testintegration&apos;) {

library identifier: &apos;recursiveMerge@master&apos;, retriever: modernSCM(
[$class: &apos;GitSCMSource&apos;,
remote: &apos;https://github.com/ome/jenkins-library-recursivemerge.git&apos;])

recursiveCheckout(
repo: &apos;omero-zarr-pixel-buffer.git&apos;)

recursiveMerge(
baseRepo: &apos;omero-zarr-pixel-buffer.git&apos;)

}</script>
<sandbox>true</sandbox>
</definition>
<triggers/>
<disabled>false</disabled>
</flow-definition>
8 changes: 8 additions & 0 deletions home/jobs/Trigger/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@
}
}

stage(&apos;OMERO zarr-pixel-buffer&apos;) {
steps {
build job: &apos;OMERO-zarr-pixel-buffer-push&apos;
build job: &apos;OMERO-zarr-pixel-buffer-build&apos;
}
}

stage(&quot;OMERO Python&quot;) {
steps {
build job: &apos;OMERO-python-superbuild-push&apos;, parameters: [string(name: &apos;STATUS&apos;, value: &quot;${params.STATUS}&quot;)]
Expand Down Expand Up @@ -126,6 +133,7 @@
build job: &apos;WEBSITE-push&apos;, wait: false
}
}

}
}</script>
<sandbox>true</sandbox>
Expand Down