Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JunJie-GitHub authored and Li Junjie committed Dec 18, 2024
2 parents fee583a + 6560922 commit 08557b1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 86 deletions.
51 changes: 0 additions & 51 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ spec:
branch: '8.16'
cronline: '@daily'
message: "Runs daily `8.16` e2e test"
Daily 8_15:
branch: '8.15'
cronline: '@daily'
message: "Runs daily `8.15` e2e test"
Daily 8_x:
branch: '8.x'
cronline: '@daily'
Expand Down Expand Up @@ -167,10 +163,6 @@ spec:
branch: '8.16'
cronline: '@daily'
message: "Runs daily `8.16` e2e aarch64 test"
Daily 8_15:
branch: '8.15'
cronline: '@daily'
message: "Runs daily `8.15` e2e aarch64 test"
Daily 8_x:
branch: '8.x'
cronline: '@daily'
Expand All @@ -185,49 +177,6 @@ spec:
search-extract-and-transform: {}
search-productivity-team: {}

########
# Nightly Docker SNAPSHOT image build and publish
# This is in place to release versions < 8.16
# Once we are no longer maintaining versions that old, this can be removed
########
---
apiVersion: "backstage.io/v1alpha1"
kind: "Resource"
metadata:
name: "connectors-nightly-dockers"
description: "Connectors Service Nightly Dockers"
links:
- title: "connectors Nightly Buildkite Jobs"
url: "https://buildkite.com/elastic/connectors"
spec:
type: "buildkite-pipeline"
owner: "group:search-extract-and-transform"
system: "buildkite"
implementation:
apiVersion: "buildkite.elastic.dev/v1"
kind: "Pipeline"
metadata:
name: "connectors-nightly-dockers"
description: "Connectors Service Nightly Dockers"
links:
- title: "Connector Service Nightly Pipeline"
url: "https://buildkite.com/elastic/connectors-nightly-dockers"
spec:
pipeline_file: ".buildkite/nightly_docker.yml"
provider_settings:
trigger_mode: "none"
repository: "elastic/connectors"
schedules:
Daily 8_15:
branch: '8.15'
cronline: '@daily'
message: "Builds and pushes daily `8.15` docker images"
teams:
everyone:
access_level: "READ_ONLY"
search-extract-and-transform: {}
search-productivity-team: {}

########
# Docker image build and publish - manual release
########
Expand Down
35 changes: 0 additions & 35 deletions docs/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,38 +62,3 @@ No manual changes to the VERSION file are necessary for these "in-between" relea
During the pipeline, it will bump the VERSION file in the branch, build the artifacts, then restore the VERSION file.
If the release build fails for some reason, check to make sure the VERSION file was properly restored.
## For versions <= 8.15
**MAJOR.MINOR.PATCH** should match the Elastic and Enterprise Search version it targets and the *BUILD* number should be set to **0** the day the Connectors release is created to be included with the Enterprise Search distribution.
For example, when shipping for `8.1.2`, the version is `8.1.2.0`.
After the Elastic unified release is complete
- Update the **BUILD** version ([example PR](https://github.com/elastic/connectors/pull/122)). Note that the Connectors project does not immediately bump to the next **PATCH** version. That won't happen until that patch release's FF date.
### Releasing docker images
To release the docker image, follow these steps:
1. Make sure that you're on the right branch and VERSION file is correct: `cat connectors/VERSION`. The value in this file should be your _expected_ release version - e.g. if you're releasing 8.12.2.1, then VERSION should also be 8.12.2.1.
2. Go to https://buildkite.com/elastic, find "connectors-docker-build-publish" pipeline and trigger a Build:
- Click on "New Build"
- Enter a descriptive message, choose commit (or leave HEAD if you build the last commit of the branch) and enter the branch (in the example with 8.12.2.1 you would put `8.12` here)
- Press "Create Build" and wait for the build to finish
3. Tag the commit that was used for the image with `git tag <tag_id> && git push origin <tag_id>`. For the example above, tag_id would be `v8.12.2.1`
4. Update `connectors/VERSION` file and bump the last part of the version by an increment and submit a PR with it. In the example above, the value would be `8.12.2.2`.
### In-Between releases
Sometimes, we need to release Connectors independently from Enterprise Search. For instance, if someone wants to use the project as an HTTP Service, and we have a bug fix we want them to have as soon as possible.
In that case, we increment the **BUILD** number, and follow the same release process than for the unified release.
So `8.1.2.1`, `8.1.2.2` etc. On the next unified release, the version will be bumped to the next **PATCH** value, and **BUILD** set to `0`
**In-Between releases should never introduce new features since they will eventually be merged into the next PATCH release.**

0 comments on commit 08557b1

Please sign in to comment.