diff --git a/.github/README.template.adoc b/.github/README.template.adoc index ec6504818..376f035c3 100644 --- a/.github/README.template.adoc +++ b/.github/README.template.adoc @@ -1,4 +1,4 @@ -= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"] += Spring Data for Elasticsearch image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"] The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57b5d3a91..5316cbd39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: CI Build on: + workflow_dispatch: push: branches: [ main, 6.0.x, 5.5.x, 'issue/**' ] @@ -16,11 +17,11 @@ jobs: steps: - uses: actions/checkout@v6 - name: Setup Java and Maven - uses: spring-projects/spring-data-release/actions/setup-maven@main + uses: spring-projects/spring-data-build/actions/setup-maven@main with: java-version: ${{ matrix.java-version }} develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}' - name: Build - uses: spring-projects/spring-data-release/actions/maven-build@main + uses: spring-projects/spring-data-build/actions/maven-build@main env: TESTCONTAINERS_REUSE_ENABLE: true diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index fae8ed3e6..2114cb92f 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -1,6 +1,7 @@ name: Snapshots on: + workflow_dispatch: push: branches: [ main, 6.0.x, 5.5.x, 'issue/**' ] @@ -14,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v6 - name: Setup Java and Maven - uses: spring-projects/spring-data-release/actions/setup-maven@main + uses: spring-projects/spring-data-build/actions/setup-maven@main with: develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}' - name: Deploy to Artifactory - uses: spring-projects/spring-data-release/actions/maven-artifactory-deploy@main + uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@main env: TESTCONTAINERS_REUSE_ENABLE: true with: diff --git a/CI.adoc b/CI.adoc index 56af9d15e..9a65bf58d 100644 --- a/CI.adoc +++ b/CI.adoc @@ -1,43 +1,5 @@ = Continuous Integration -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=2020.0.0%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F4.0.x&subject=Neumann%20(4.0.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] -image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.2.x&subject=Moore%20(3.2.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] - == Running CI tasks locally -Since this pipeline is purely Docker-based, it's easy to: - -* Debug what went wrong on your local machine. -* Test out a a tweak to your `verify.sh` script before sending it out. -* Experiment against a new image before submitting your pull request. - -All of these use cases are great reasons to essentially run what the CI server does on your local machine. - -IMPORTANT: To do this you must have Docker installed on your machine. - -1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`. -+ -2. `cd spring-data-elasticsearch-github` -+ -Next, run your tests from inside the container: -+ -3. `./mvnw clean dependency:list test -Dsort` (or whatever profile you need to test out) - -Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs. - -If you need to package things up, do this: - -1. `docker run -it -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`. -+ -2. `cd spring-data-elasticsearch-github` -+ -Next, try to package everything up from inside the container: -+ -3. `./mvnw -Pci,snapshot -Dmaven.test.skip=true clean package` - -NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images. +You can run CI jobs locally using Docker and act[https://nektosact.com/]. diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1d2500ed1..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,132 +0,0 @@ -def p = [:] -node { - checkout scm - p = readProperties interpolate: true, file: 'ci/pipeline.properties' -} - -pipeline { - agent none - - triggers { - pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS) - } - - options { - disableConcurrentBuilds() - buildDiscarder(logRotator(numToKeepStr: '14')) - } - - stages { - stage("test: baseline (main)") { - when { - beforeAgent(true) - anyOf { - branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP") - not { triggeredBy 'UpstreamCause' } - } - } - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES') } - - environment { - ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") - } - - steps { - script { - docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { - sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh" - sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh" - } - } - } - } - } - - stage("Test other configurations") { - when { - beforeAgent(true) - allOf { - branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP") - not { triggeredBy 'UpstreamCause' } - } - } - parallel { - stage("test: baseline (next)") { - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES') } - environment { - ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") - } - steps { - script { - docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { - sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh" - sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh" - } - } - } - } - } - } - } - - stage('Release to artifactory') { - when { - beforeAgent(true) - anyOf { - branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP") - not { triggeredBy 'UpstreamCause' } - } - } - agent { - label 'data' - } - options { timeout(time: 20, unit: 'MINUTES') } - environment { - ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") - } - steps { - script { - docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { - sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "./mvnw -s settings.xml -Pci,artifactory " + - "-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " + - "-Dartifactory.server=${p['artifactory.url']} " + - "-Dartifactory.username=${ARTIFACTORY_USR} " + - "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + - "-Dartifactory.build-name=spring-data-elasticsearch " + - "-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " + - "-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch " + - "-Dmaven.test.skip=true clean deploy -U -B" - } - } - } - } - } - } - - post { - changed { - script { - emailext( - subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", - mimeType: 'text/html', - recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], - body: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") - } - } - } -} diff --git a/README.adoc b/README.adoc index 0242089d8..7919df702 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"] += Spring Data for Elasticsearch image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"] The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services. diff --git a/ci/clean.sh b/ci/clean.sh deleted file mode 100755 index ca174330e..000000000 --- a/ci/clean.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -x - -set -euo pipefail - -export JENKINS_USER=${JENKINS_USER_NAME} - -MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \ - ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root diff --git a/ci/pipeline.properties b/ci/pipeline.properties deleted file mode 100644 index 556667d0a..000000000 --- a/ci/pipeline.properties +++ /dev/null @@ -1,33 +0,0 @@ -# Java versions -java.main.tag=25.0.1_8-jdk-noble -java.next.tag=25.0.1_8-jdk-noble - -# Docker container images - standard -docker.java.main.image=library/eclipse-temurin:${java.main.tag} -docker.java.next.image=library/eclipse-temurin:${java.next.tag} - -# Supported versions of MongoDB -docker.mongodb.6.0.version=6.0.23 -docker.mongodb.7.0.version=7.0.20 -docker.mongodb.8.0.version=8.0.9 - -# Supported versions of Redis -docker.redis.6.version=6.2.13 -docker.redis.7.version=7.2.4 -docker.redis.8.version=8.2.2 -docker.valkey.8.version=8.1.1 - -# Docker environment settings -docker.java.inside.basic=-v $HOME:/tmp/jenkins-home --ulimit nofile=32000:32000 -docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home --ulimit nofile=32000:32000 - -# Credentials -docker.registry= -docker.credentials=hub.docker.com-springbuildmaster -docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com -docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token -artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c -artifactory.url=https://repo.spring.io -artifactory.repository.snapshot=libs-snapshot-local -develocity.access-key=gradle_enterprise_secret_access_key -jenkins.user.name=spring-builds+jenkins diff --git a/ci/verify.sh b/ci/verify.sh deleted file mode 100755 index 46afc8028..000000000 --- a/ci/verify.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -x - -set -euo pipefail - -mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch -export JENKINS_USER=${JENKINS_USER_NAME} - -MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \ - ./mvnw -s settings.xml \ - -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root