Skip to content

Commit

Permalink
ES-1978: set up 5.3 release branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ronanbrowne committed Feb 20, 2024
1 parent f800a64 commit dc0a553
Show file tree
Hide file tree
Showing 30 changed files with 143 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .ci/JenkinsfileCombinedWorkerPluginsSmokeTests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

import groovy.transform.Field
import com.r3.build.utils.PipelineUtils
Expand Down
6 changes: 3 additions & 3 deletions .ci/JenkinsfileCommentRebuild
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

import static com.r3.build.BuildControl.cancelQueuedJobByName

cancelQueuedJobByName(env.JOB_NAME)

githubCommentBuildTests(
branch: 'release/5.2',
chartVersion: '^5.2.0-alpha',
branch: 'release/5.3',
chartVersion: '^5.3.0-alpha',
)
6 changes: 3 additions & 3 deletions .ci/JenkinsfileMergeAutomation
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! groovy
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

/**
* Forward merge any changes in current branch to the branch with following version.
Expand All @@ -14,13 +14,13 @@
* the branch name of origin branch, it should match the current branch
* and it acts as a fail-safe inside {@code forwardMerger} pipeline
*/
String originBranch = 'release/os/5.1'
String originBranch = 'release/os/5.2'

/**
* the branch name of target branch, it should be the branch with the next version
* after the one in current branch.
*/
String targetBranch = 'release/os/5.2'
String targetBranch = 'release/os/5.3'

/**
* Forward merge any changes between {@code originBranch} and {@code targetBranch}
Expand Down
2 changes: 1 addition & 1 deletion .ci/JenkinsfileSnykDelta
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

snykDelta(
snykOrgId: 'corda5-snyk-org-id',
Expand Down
2 changes: 1 addition & 1 deletion .ci/PublishHelmChart/Jenkinsfile_PublishHelmChart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! groovy
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

import com.r3.build.agents.KubernetesAgent
import com.r3.build.enums.BuildEnvironment
Expand Down
2 changes: 1 addition & 1 deletion .ci/dev/forward-merge/JenkinsInteropMerge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

/*
* Forward merge any changes in current branch to the branch with following version.
Expand Down
6 changes: 3 additions & 3 deletions .ci/dev/forward-merge/JenkinsfileMergeAutomation
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! groovy
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

/**
* Forward merge any changes in current branch to the branch with following version.
Expand All @@ -14,13 +14,13 @@
* the branch name of origin branch, it should match the current branch
* and it acts as a fail-safe inside {@code forwardMerger} pipeline
*/
String originBranch = 'release/os/5.2'
String originBranch = 'release/os/5.3'

/**
* the branch name of target branch, it should be the branch with the next version
* after the one in current branch.
*/
String targetBranch = 'release/os/5.3'
String targetBranch = 'release/os/5.4'

/**
* Forward merge any changes between {@code originBranch} and {@code targetBranch}
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

endToEndPipeline(
assembleAndCompile: false,
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/JenkinsfileCombinedWorker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

import groovy.transform.Field
import com.r3.build.utils.PipelineUtils
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/JenkinsfileCombinedWorkerLinux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

combinedWorkerPipeline(
agentOs : 'linux'
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/JenkinsfileCombinedWorkerWindows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

combinedWorkerPipeline(
agentOs : 'windows'
Expand Down
6 changes: 3 additions & 3 deletions .ci/e2eTests/JenkinsfileEnterpriseSmokeTests
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* Pipeline to take a packaged helm chart, deploy it and subsequently run the smoke test target
* in this repo against these images - Can be used to exercise the C5 Ent images against smoke tests in corda-runtime-os
*/
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

endToEndPipeline(
helmVersion: '^5.2.0-beta',
helmRepoSuffix: 'release/ent/5.2',
helmVersion: '^5.3.0-beta',
helmRepoSuffix: 'release/ent/5.3',
helmRepo: 'corda-ent-docker',
dailyBuildCron: '',
enableNotifications: false,
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/JenkinsfileUnstableTest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

endToEndPipeline(
assembleAndCompile: true,
Expand Down
2 changes: 1 addition & 1 deletion .ci/e2eTests/ethereum/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

ethereumInterop(
deployEthereum: true,
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileNightly
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

cordaPipelineKubernetesAgent(
dailyBuildCron: 'H 03 * * *',
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileSnykScan
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

cordaSnykScanPipeline (
snykTokenId: 'r3-snyk-corda5',
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileUnstableTests
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//catch all job for flaky tests
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

cordaPipelineKubernetesAgent(
runIntegrationTests: true,
Expand Down
2 changes: 1 addition & 1 deletion .ci/nightly/JenkinsfileWindowsCompatibility
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

windowsCompatibility(
runIntegrationTests: true,
Expand Down
2 changes: 1 addition & 1 deletion .ci/versionCompatibility/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

cordaCompatibilityCheckPipeline(javaVersion: '17')
2 changes: 1 addition & 1 deletion .ci/versionCompatibility/latest-version.Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

// This build forces using the "very latest" version of the dependencies, regardless of which revision was chosen
// This is useful as it gives early indication of a downstream change that may introduce a breaking change
Expand Down
107 changes: 99 additions & 8 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,14 +1,105 @@
# Build scripts should be audited by BLT

Jenkinsfile @corda/blt
.ci/** @corda/blt

*.gradle @corda/blt
gradle/wrapper @corda/blt
gradle.properties @corda/corda5-team-leads
/gradle/wrapper/ @corda/blt
*.toml @corda/corda5-team-leads

.github/** @corda/blt
CODEOWNERS @corda/blt @corda/corda5-team-leads

# Modules to be audited by REST team
/applications/workers/release/rest-worker/ @corda/rest
/components/rest-gateway-comp/ @corda/rest
/components/permissions/ @corda/rest
/components/rbac-security-manager-service/ @corda/rest
/components/virtual-node/ @corda/rest
/libs/rest/ @corda/rest
/libs/permissions/ @corda/rest
/libs/virtual-node/ @corda/rest
/processors/rest-processor/ @corda/rest
/tools/plugins/initial-rbac/ @corda/rest
/tools/plugins/plugins-rest/ @corda/rest
/tools/plugins/virtual-node/ @corda/rest

# Helm charts for BLT team
/charts/ @corda/blt

# Modules to be audited by the Network team
/applications/workers/release/p2p-gateway-worker/ @corda/corda-platform-network-team
/applications/workers/release/p2p-link-manager-worker/ @corda/corda-platform-network-team
/applications/workers/release/member-worker/ @corda/corda-platform-network-team
/processors/link-manager-processor/ @corda/corda-platform-network-team
/processors/gateway-processor/ @corda/corda-platform-network-team
/processors/member-processor/ @corda/corda-platform-network-team
/components/gateway/ @corda/corda-platform-network-team
/components/link-manager/ @corda/corda-platform-network-team
/components/membership/ @corda/corda-platform-network-team
/libs/membership/ @corda/corda-platform-network-team
/libs/p2p-crypto/ @corda/corda-platform-network-team
/libs/layered-property-map/ @corda/corda-platform-network-team
/tools/plugins/mgm/ @corda/corda-platform-network-team
/tools/plugins/network/ @corda/corda-platform-network-team
/applications/tools/p2p-test/ @corda/corda-platform-network-team

# Modules to be audited by Sandboxing SMEs
/components/security-manager/ @corda/sandboxing
/components/virtual-node/sandbox-* @corda/sandboxing
/components/sandbox* @corda/sandboxing
/libs/virtual-node/sandbox-* @corda/sandboxing
/osgi-* @corda/sandboxing
/testing/sandboxes/ @corda/sandboxing
/testing/sandboxes-testkit/ @corda/sandboxing
/testing/security-manager-utilities/ @corda/sandboxing

# Modules to be audited by Crypto SMEs
/components/crypto/ @corda/crypto
/libs/crypto/ @corda/crypto
/processors/crypto/ @corda/crypto

# Modules to be audited by Packaging SMEs
/components/chunking/ @corda/packaging
/components/virtual-node/cpi-* @corda/packaging
/components/virtual-node/cpk-* @corda/packaging
/libs/chunking/ @corda/packaging
/libs/packaging/ @corda/packaging
/libs/serialization/ @corda/packaging
/libs/virtual-node/cpi-* @corda/packaging
/testing/packaging-test-utilities/ @corda/packaging
/tools/plugins/package @corda/packaging

# Modules to be audited by DB SMEs
/components/db/ @corda/db
/components/persistence/ @corda/db
/components/reconciliation/ @corda/db
/libs/db/ @corda/db
/processors/db/ @corda/db
/testing/persistence-testkit/ @corda/db
/tools/plugins/db-config @corda/db

# Modules to be audited by Flow Worker team
/components/flow/ @corda/flow-worker
/libs/flows/ @corda/flow-worker
/libs/lifecycle/ @corda/flow-worker
/libs/messaging/ @corda/flow-worker
/libs/application/application-impl/ @corda/flow-worker
/processors/flow-processor/ @corda/flow-worker
/testing/flow/ @corda/flow-worker
/testing/message-patterns/ @corda/flow-worker
/applications/workers/release/flow-worker @corda/flow-worker

# Modules to be audited by Ledger SMEs
/components/ledger/ @corda/ledger
/libs/ledger/ @corda/ledger
/testing/ledger/ @corda/ledger

# Modules to be audited by Notary SMEs
/components/uniqueness/ @corda/notaries
/libs/uniqueness/ @corda/notaries
/notary-plugins/ @corda/notaries
@@ -105,7 +10,5 @@ CODEOWNERS @corda/blt @corda/corda5-team-leads
/processors/uniqueness-processor/ @corda/notaries
/testing/uniqueness/ @corda/notaries

# Code freeze reviewers
* @driessamyn @jasonbyrner3 @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal @dickon @owenstanford
# Ledger token selection files to be reviewed by the REST team
# This needs to be after the ledger rules to partially override those
/components/ledger/ledger-utxo-token-cache @corda/rest
/components/ledger/ledger-utxo-flow/src/main/kotlin/net/corda/ledger/utxo/impl/token @corda/rest
2 changes: 1 addition & 1 deletion .run/Combined Worker Local.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Combined Worker Local" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/applications/workers/release/combined-worker/build/bin/corda-combined-worker-5.2.0.0-SNAPSHOT.jar" />
<option name="JAR_PATH" value="$PROJECT_DIR$/applications/workers/release/combined-worker/build/bin/corda-combined-worker-5.3.0.0-SNAPSHOT.jar" />
<option name="VM_PARAMETERS" value="-Dco.paralleluniverse.fibers.verifyInstrumentation=true" />
<option name="PROGRAM_PARAMETERS" value="--instance-id=0 -mbus.busType=DATABASE -spassphrase=password -ssalt=salt -spassphrase=password -ssalt=salt -ddatabase.user=user -ddatabase.pass=password -ddatabase.jdbc.url=jdbc:postgresql://localhost:5432/cordacluster -ddatabase.jdbc.directory=$ProjectFileDir$/applications/workers/release/combined-worker/drivers -rtls.crt.path=$ProjectFileDir$/applications/workers/release/combined-worker/tls/rest/server.crt -rtls.key.path=$ProjectFileDir$/applications/workers/release/combined-worker/tls/rest/server.key -rtls.ca.crt.path=$ProjectFileDir$/applications/workers/release/combined-worker/tls/rest/ca-chain-bundle.crt" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('corda-shared-build-pipeline-steps@5.2') _
@Library('corda-shared-build-pipeline-steps@5.3') _

cordaPipelineKubernetesAgent(
dailyBuildCron: 'H H/6 * * *',
Expand Down
2 changes: 1 addition & 1 deletion applications/tools/metrics-webserver/README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ the default values inside the code.
From a terminal, run the jar providing the `-f` and `-p` arguments if necessary. Example:

```shell
java -jar metrics-webserver-5.2.0.jar -f metrics.txt -p 3000
java -jar metrics-webserver-5.3.0.jar -f metrics.txt -p 3000
```

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ deploy() {
--render-subchart-notes \
--timeout 10m \
--wait"
corda_args="--install corda -n $namespace oci://corda-os-docker.software.r3.com/helm-charts/release/os/5.2/corda \
corda_args="--install corda -n $namespace oci://corda-os-docker.software.r3.com/helm-charts/release/os/5.3/corda \
--set imagePullSecrets={docker-registry-cred} --set image.tag=$DOCKER_IMAGE_VERSION \
--set image.registry=corda-os-docker.software.r3.com --values $REPO_TOP_LEVEL_DIR/values.yaml \
--set bootstrap.kafka.partitions=$KAFKA_PARTITION_COUNT \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
NAMESPACE_PREFIX="${USER//./}"

# Chart and Docker Image versions to deploy
CORDA_CHART_VERSION="^5.2.0-beta"
CORDA_CHART_VERSION="^5.3.0-beta"
REPO_TOP_LEVEL_DIR=$(cd "$SCRIPT_DIR"; git rev-parse --show-toplevel)
CORDA_VERSION="$(cat $REPO_TOP_LEVEL_DIR/gradle.properties | grep cordaProductVersion | awk -F= '{print $2}' | xargs).0"
if [ -z $DOCKER_IMAGE_VERSION ]; then
Expand Down
2 changes: 1 addition & 1 deletion build-benchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# to Gradle Enterprise so that we can analyse them.
#
MAX_WORKERS=4
TAG_BENCHMARK="build-benchmark-5.2" # Gradle build scan label prefix - should remain stable
TAG_BENCHMARK="build-benchmark-5.3" # Gradle build scan label prefix - should remain stable
TAG_EXP="${TAG_BENCHMARK}-0002" # Gradle build scan label suffix - can be incremented in case we want another set of benchmarks, for example to compare a before/after change

TAG_CACHE="cache"
Expand Down
4 changes: 2 additions & 2 deletions charts/corda-lib/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: library
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.2.0
version: 5.3.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "unstable-5.2.0"
appVersion: "unstable-5.3.0"
6 changes: 3 additions & 3 deletions charts/corda/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.2.0
version: 5.3.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "unstable-5.2.0"
appVersion: "unstable-5.3.0"

dependencies:
- name: "corda-lib"
version: "5.2.0"
version: "5.3.0"
repository: "file://../corda-lib"
Loading

0 comments on commit dc0a553

Please sign in to comment.