diff --git a/home/jobs/OMERO-server/config.xml b/home/jobs/OMERO-server/config.xml index 5cbe66ae..c52c157a 100644 --- a/home/jobs/OMERO-server/config.xml +++ b/home/jobs/OMERO-server/config.xml @@ -95,6 +95,16 @@ rm -rf $WORKSPACE/* # Should leave .venv3 true false + + + OMERO-zarr-pixel-buffer-build + + + false + + + true + false @@ -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 @@ -187,4 +209,4 @@ deactivate - \ No newline at end of file + diff --git a/home/jobs/OMERO-zarr-pixel-buffer-build/config.xml b/home/jobs/OMERO-zarr-pixel-buffer-build/config.xml new file mode 100644 index 00000000..b73187d2 --- /dev/null +++ b/home/jobs/OMERO-zarr-pixel-buffer-build/config.xml @@ -0,0 +1,36 @@ + + + + + false + + + testintegration + false + false + false + false + + false + + + 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 + + + + + + **/build/libs/*.jar + false + false + false + true + true + false + + + + diff --git a/home/jobs/OMERO-zarr-pixel-buffer-push/config.xml b/home/jobs/OMERO-zarr-pixel-buffer-push/config.xml new file mode 100644 index 00000000..d6a71c8b --- /dev/null +++ b/home/jobs/OMERO-zarr-pixel-buffer-push/config.xml @@ -0,0 +1,47 @@ + + + + Run scc merge and bump versions on omero-zarr-pixel-buffer + false + + + + + STATUS + PR check status + + + success-only + no-error + none + + + + + MERGE_OPTIONS + scc merge options + -vvv --no-ask --reset --comment + false + + + + + + + true + + + false + \ No newline at end of file diff --git a/home/jobs/Trigger/config.xml b/home/jobs/Trigger/config.xml index 93f10fef..044c7de1 100644 --- a/home/jobs/Trigger/config.xml +++ b/home/jobs/Trigger/config.xml @@ -69,6 +69,13 @@ } } + stage('OMERO zarr-pixel-buffer') { + steps { + build job: 'OMERO-zarr-pixel-buffer-push' + build job: 'OMERO-zarr-pixel-buffer-build' + } + } + stage("OMERO Python") { steps { build job: 'OMERO-python-superbuild-push', parameters: [string(name: 'STATUS', value: "${params.STATUS}")] @@ -126,6 +133,7 @@ build job: 'WEBSITE-push', wait: false } } + } } true