New parallel sanity stage + test migrations

Author: 4ydan

ci/Jenkinsfile

@@ -33,11 +33,10 @@ def runDockerWithPostgresSidecar(String command, String stashsrc='', String stas
             checkout scm
             def rust_image = docker.build("permaplant-rust", "./ci/container-images/permaplant-rust")
             docker.image('postgis/postgis:13-3.1').withRun('-e "POSTGRES_USER=ci" -e "POSTGRES_PASSWORD=ci"') { c ->
-                rust_image.inside("--link ${c.id}:db -e 'DATABASE_URL=postgres://ci:ci@db/ci' -e 'BIND_ADDRESS_HOST=127.0.0.1' -e 'BIND_ADDRESS_PORT=8080' -e 'AUTH_DISCOVERY_URI=unused' -e 'AUTH_CLIENT_ID=unused' -e 'RUSTFLAGS=-D warnings' -e 'RUSTDOCFLAGS=-D warnings'") {
+                rust_image.inside("--link ${c.id}:db -e 'DATABASE_URL=postgres://ci:ci@db/ci' -e 'BIND_ADDRESS_HOST=127.0.0.1' -e 'BIND_ADDRESS_PORT=8080' -e 'AUTH_DISCOVERY_URI=unused' -e 'AUTH_CLIENT_ID=unused' -e 'RUSTFLAGS=-D warnings' -e 'RUSTDOCFLAGS=-D warnings' -e 'LC_ALL=C'") {
                     checkout scm
                     wait_for_db()
                     sh './ci/build-scripts/build-schema.sh'
-                    // Because in Deploy the path for /target is a env in permaplant-deploy.sh, we can only solve it with prepending cd backend
                     sh "cd backend && ${command}"
                     if (stashsrc != null && stashdir != '') {
                         stash includes: stashsrc, name: stashdir
@@ -109,39 +108,30 @@ def testAndBuildFrontend() {
     }
 }
 
+def determineMigration() {
+    if (env.BRANCH_NAME!="master") {
+        return "make migration-redo && make migration-redo-a"
+    } else {
+        return "make migration-redo"
+    }
+}
+
 // PIPELINE BEGIN
 abortPreviousRunUnlessMaster()
 
-// REQUIRED for Deployment
-// see Jenkinsfile.release
-stage('FMT check  Build Schema'){
-    node('docker') {
-        node_info()
-        checkout scm
-        def rust_image = docker.build("permaplant-rust", "./ci/container-images/permaplant-rust")
-        docker.image('postgis/postgis:13-3.1').withRun('-e "POSTGRES_USER=ci" -e "POSTGRES_PASSWORD=ci"') { c ->
-            rust_image.inside("--link ${c.id}:db -e 'DATABASE_URL=postgres://ci:ci@db/ci'") {
-                checkout scm
-                wait_for_db()
-                withEnv(['RUSTFLAGS=-D warnings', 'RUSTDOCFLAGS=-D warnings']) {
-                    // Workaround: we can't stop rustfmt from linting the generated schema.rs
-                    dir("backend") {
-                        sh "/bin/bash -c 'echo \"\" > src/schema.rs'"
-                        sh "cargo fmt --check"
-                    // End of Workaround
-                    }
-                    sh './ci/build-scripts/build-schema.sh'
-                }
-                stash includes: 'backend/src/schema.rs', name: 'schema.rs'
-                stash includes: 'frontend/src/bindings/definitions.ts', name: 'definitions.ts'
-            }
+timeout(time: 2, unit: 'HOURS') {
+    try {
+        stage('Sanity') {
+            parallel(
+                    // Workaround: we can't stop rustfmt from linting the generated schema.rs so we empty the file before.
+                    "cargo-fmt": runDockerWithPostgresSidecar("/bin/bash -c 'echo \"\" > src/schema.rs' && cargo fmt --check"),
+                    "schema": runDockerWithPostgresSidecar('echo schema test', 'backend/src/schema.rs', 'schema.rs'),
+                    "migration": runDockerWithPostgresSidecar(determineMigration()),
+                    failFast: true
+            )
         }
-    }
-}
 
-stage('Parallel Stage') {
-    timeout(time: 2, unit: 'HOURS'){
-        try {
+        stage('Test and Build') {
             parallel(
                     "cargo-build": runDockerWithPostgresSidecar('cargo build --release && cargo clippy', 'backend/target/release/backend', 'backend'),
                     "cargo-check": runDockerWithPostgresSidecar('cargo check && cargo doc'),
@@ -150,10 +140,10 @@ stage('Parallel Stage') {
                     "mdbook": testAndBuildMdbook(),
                     failFast: true
             )
-        } catch(err) {
-            deleteDir();
-            throw err;
         }
+    } catch(err) {
+        deleteDir();
+        throw err;
     }
 }
 

ci/container-images/permaplant-rust/Dockerfile

@@ -1,6 +1,6 @@
 FROM rust:1.67.1-slim
 
-RUN apt update && apt install -y libpq-dev libssl-dev pkg-config postgresql-client
+RUN apt update && apt install -y make libpq-dev libssl-dev pkg-config postgresql-client
 RUN rustup component add clippy rustfmt
 RUN cargo install [email protected] --no-default-features --features postgres
 RUN cargo install typeshare-cli