CORE-17387: Merging forward updates from release/os/5.1 to release/interop/syntax - 2023-10-03

.ci/JenkinsfileCombinedWorkerPluginsSmokeTests

@@ -0,0 +1,152 @@
+@Library('[email protected]') _
+
+import groovy.transform.Field
+import com.r3.build.utils.PipelineUtils
+import com.r3.build.utils.GitUtils
+
+@Field
+String postgresHost = 'localhost'
+@Field
+String postgresPort = '5432'
+@Field
+String postgresCredentialsId = 'e2e-postgresql-credentials'
+@Field
+String postgresDb = "test_${UUID.randomUUID().toString().replace("-", "")}"
+
+@Field
+PipelineUtils pipelineUtils = new PipelineUtils(this)
+
+@Field
+GitUtils gitUtils = new GitUtils(this)
+
+pipeline {
+    agent {
+        docker {
+            image 'build-zulu-openjdk:17'
+            label 'docker'
+            registryUrl 'https://engineering-docker.software.r3.com/'
+            registryCredentialsId 'artifactory-credentials'
+            args '-v /tmp:/host_tmp '
+            alwaysPull true
+        }
+    }
+
+    triggers {
+        cron(gitUtils.isReleaseBranch() ? 'H 00 * * *' : '')
+    }
+
+    environment {
+        ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
+        BUILD_CACHE_CREDENTIALS = credentials('gradle-ent-cache-credentials')
+        POSTGRES_CREDENTIALS = credentials('e2e-postgresql-credentials')
+        BUILD_CACHE_USERNAME = "${env.BUILD_CACHE_CREDENTIALS_USR}"
+        BUILD_CACHE_PASSWORD = "${env.BUILD_CACHE_CREDENTIALS_PSW}"
+        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
+        CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}"
+        CORDA_DEV_POSTGRES_USER="${env.POSTGRES_CREDENTIALS_USR}"
+        CORDA_DEV_POSTGRES_PASSWORD="${env.POSTGRES_CREDENTIALS_PSW}"
+        CORDA_DEV_CLUSTER_DB_NAME="${postgresDb}"
+        CORDA_USE_CACHE = "corda-remotes"
+        KUBECONFIG = credentials("e2e-tests-credentials")
+        CORDA_CLI_USER_HOME = "/tmp/corda-cli-home"
+        CORDA_GRADLE_SCAN_KEY = credentials('gradle-build-scans-key')
+        GRADLE_USER_HOME = "/host_tmp/gradle"
+        CORDA_REVISION = "${env.GIT_COMMIT}"
+        GRADLE_PERFORMANCE_TUNING = "--max-workers=4 --parallel -Dscan.tag.combined-worker --build-cache -Si"
+    }
+
+    parameters {
+        string(name: 'COMMIT_TO_CHECKOUT', defaultValue: '', description: 'Commit ID to check out of SCM - leave blank to take head of current branch')
+    }
+
+    options {
+        buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
+        timestamps()
+    }
+
+    stages {
+        stage('check out') {
+            steps {
+                script {
+                    gitUtils.checkoutGitRevisionOfTriggeringJob(params.COMMIT_TO_CHECKOUT)
+                }
+            }
+        }
+        stage('create DBs') {
+            environment {
+                KUBECONFIG = credentials('e2e-tests-credentials')
+            }
+            steps {
+                script {
+                    pipelineUtils.createPostgresDatabase(postgresPort, postgresHost, postgresDb, postgresCredentialsId)
+                }
+            }
+        }
+        stage('build') {
+            steps {
+                gradlew (':applications:workers:release:combined-worker:assemble')
+            }
+        } 			
+        stage('start combined worker') {       
+            environment {
+                JAR_PATH = "${env.WORKSPACE}/applications/workers/release/combined-worker/build/bin/corda-combined-worker-*.jar"
+                JDBC_PATH = "${env.WORKSPACE}/applications/workers/release/combined-worker/drivers"
+                REST_TLS_PATH = "${env.WORKSPACE}/applications/workers/release/combined-worker/tls/rest/rest_worker.pfx"
+                VM_PARAMETERS = "-Dco.paralleluniverse.fibers.verifyInstrumentation=true"
+                LOG4J_PARAMETERS = "-Dlog4j.configurationFile=log4j2-console.xml"
+                PROGRAM_PARAMETERS = "--instance-id=0 -mbus.busType=DATABASE -spassphrase=password -ssalt=salt -ddatabase.user=u${postgresDb} -ddatabase.pass=password -ddatabase.jdbc.url=jdbc:postgresql://${postgresHost}:${postgresPort}/${postgresDb} -ddatabase.jdbc.directory=${JDBC_PATH} -rtls.keystore.path=${REST_TLS_PATH} -rtls.keystore.password=mySecretPassword"
+                WORKING_DIRECTORY = "${env.WORKSPACE}"
+            }
+            steps {
+                sh '''
+                    nohup java ${LOG4J_PARAMETERS} -jar ${VM_PARAMETERS} ${JAR_PATH} ${PROGRAM_PARAMETERS} 2<&1 > workerLogs.txt &
+                    export PROCNO=$!
+                '''        
+            }            
+        }
+        stage('connect to combined worker') {
+            steps {
+                script {
+                    pipelineUtils.waitForServiceToBeUp('http://localhost:7004/status', 20, 3)
+                }
+            }
+        }
+        stage('plugin smoke tests') {
+                options {
+                    timeout(time: 30, unit: 'MINUTES')
+                }
+                steps {
+                   gradlew('pluginSmoketest -PisCombinedWorker=true')
+                }
+                post {
+                    always {
+                        junit allowEmptyResults: true, testResults: '**/test-results/**/TEST-*.xml'
+                    }
+                }
+        }
+    }
+    post {
+        always {
+            script {      
+                    findBuildScans()
+                    pipelineUtils.getPodLogs("postgres")
+                    pipelineUtils.dropPostgresDB(postgresCredentialsId, env.CORDA_DEV_CLUSTER_DB_NAME)
+            }
+            archiveArtifacts artifacts: 'forward.txt, workerLogs.txt, podLogs.txt', allowEmptyArchive: true
+            sh 'rm -f forward.txt workerLogs.txt podLogs.txt'
+        }
+        failure {
+            sendSlackNotifications("danger", "BUILD FAILURE - Combined Worker CLI Plugins Smoke Tests", true, "#corda-corda5-build-notifications")
+        }
+    }
+}
+
+
+def gradleCmd() {
+    return isUnix() ? './gradlew' : './gradlew.bat'
+}
+
+def gradlew(String... args) {
+    def allArgs = args.join(' ')
+    sh "${gradleCmd()} ${allArgs} ${GRADLE_PERFORMANCE_TUNING}"
+}

.ci/e2eTests/JenkinsfileCombinedWorker

@@ -119,7 +119,7 @@ pipeline {
                         junit allowEmptyResults: true, testResults: '**/test-results/**/TEST-*.xml'
                     }
                 }
-        } 	        
+        }
     }
     post {
         always {

.github/CODEOWNERS

@@ -19,6 +19,9 @@ CODEOWNERS         @corda/blt @corda/corda5-team-leads
 /libs/rest/                                     @corda/rest
 /libs/permissions/                              @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
 
 # Corda Helm chart for cluster management team
 /charts/corda/                                @corda/cluster-management

applications/examples/sandbox-app/build.gradle

@@ -65,6 +65,7 @@ dependencies {
     runtimeOnly project(':libs:messaging:db-message-bus-impl')
     runtimeOnly project(':libs:serialization:serialization-checkpoint-api')
     runtimeOnly project(':libs:serialization:serialization-kryo')
+    runtimeOnly project(':libs:state-manager:state-manager-db-impl')
     runtimeOnly project(':testing:group-policy-test-common')
     runtimeOnly project(':libs:web:web-impl')
 

applications/tools/p2p-test/app-simulator/scripts/deploy.sh

@@ -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.0/corda \
+   corda_args="--install corda -n $namespace oci://corda-os-docker.software.r3.com/helm-charts/release/os/5.1/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 \

applications/tools/p2p-test/app-simulator/scripts/settings.sh

@@ -5,7 +5,7 @@
 NAMESPACE_PREFIX="${USER//./}"
 
 # Chart and Docker Image versions to deploy
-CORDA_CHART_VERSION="^5.0.0-beta"
+CORDA_CHART_VERSION="^5.1.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

applications/workers/release/combined-worker/build.gradle

@@ -68,6 +68,7 @@ dependencies {
     implementation project(':libs:crypto:crypto-config-impl')
     implementation project(':libs:crypto:crypto-core')
     implementation project(':libs:crypto:crypto-impl')
+    implementation project(":libs:lifecycle:registry")
     implementation project(':libs:platform-info')
     implementation project(':libs:tracing')
     implementation project(':libs:web:web')