Fix cp -r handler and base-builder copy-test command

Signed-off-by: Ricardo Zanini <[email protected]>
apache · Sep 23, 2024 · 1d5247a · 1d5247a
1 parent 23fd2df
commit 1d5247a
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 17 deletions.
diff --git a/packages/kogito-base-builder-image/package.json b/packages/kogito-base-builder-image/package.json
@@ -17,14 +17,12 @@
     "build:prod": "pnpm build:dev && pnpm image:test",
     "copy-assets": "run-script-os",
     "copy-assets:linux:darwin": "rimraf build && cp -R ./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R resources/* build",
-    "copy-test-assets": "run-script-os",
-    "copy-test-assets:linux:darwin": "cp -R test-resources/. build",
     "format": "prettier --write . --ignore-path=../../.prettierignore --ignore-path=../../.gitignore",
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
-    "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+    "image:test:darwin:linux": "pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",
     "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env kogitoBaseBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env kogitoBaseBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env kogitoBaseBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env kogitoBaseBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"

diff --git a/packages/kogito-data-index-ephemeral-image/package.json b/packages/kogito-data-index-ephemeral-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/packages/kogito-data-index-postgresql-image/package.json b/packages/kogito-data-index-postgresql-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/packages/kogito-jit-runner-image/package.json b/packages/kogito-jit-runner-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/packages/kogito-jobs-service-allinone-image/package.json b/packages/kogito-jobs-service-allinone-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/...to-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/configure b/...to-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/configure
@@ -28,7 +28,7 @@ mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-
 rm -rf "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
 ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
 
-cp -r "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
+cp -R "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
 rm -rf "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
 ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
 

diff --git a/packages/kogito-jobs-service-ephemeral-image/package.json b/packages/kogito-jobs-service-ephemeral-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/packages/kogito-jobs-service-postgresql-image/package.json b/packages/kogito-jobs-service-postgresql-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build-kogito-app build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json
@@ -23,7 +23,7 @@
     "image:build": "run-script-os",
     "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
     "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "install": "node install.js && pnpm format",

diff --git a/...r-image/resources/modules/sonataflow/builder/tests/bats/sonataflow-builder-build-app.bats b/...r-image/resources/modules/sonataflow/builder/tests/bats/sonataflow-builder-build-app.bats
@@ -35,7 +35,7 @@ teardown() {
 
 @test "verify copy resources is working" {
     TEMPD=$(mktemp -d)
-    cp -r $BATS_TEST_DIRNAME/../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
+    cp -R $BATS_TEST_DIRNAME/../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
 
     # We don't care about the errors to try to execute and build the program, just the copy matters
     source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true

diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json
@@ -24,7 +24,7 @@
     "image:build": "run-script-os",
     "image:build:linux": "pnpm setup:env make -C ./build build",
     "image:build:win32": "echo \"Build skipped on Windows\"",
-    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -R build/target/test/results dist-tests-e2e/\"",
     "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",

diff --git a/...esources/modules/kogito-dynamic-resources/tests/bats/sonataflow-builder-jvm-settings.bats b/...esources/modules/kogito-dynamic-resources/tests/bats/sonataflow-builder-jvm-settings.bats
@@ -25,7 +25,7 @@ export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
 mkdir -p "${KOGITO_HOME}"/launch
 mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp -r $BATS_TEST_DIRNAME/../../added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+cp -R $BATS_TEST_DIRNAME/../../added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
 chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
 cp $BATS_TEST_DIRNAME/../../../sonataflow/common/scripts/added/jvm-settings.sh "${KOGITO_HOME}"/launch/
 

diff --git a/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/configure b/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/configure
@@ -23,7 +23,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
+cp -Rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh
@@ -99,7 +99,7 @@ for ctx in ${contextDir}; do
 
     if stat ${HOME}/.m2/repository/ &> /dev/null; then
         echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
-        cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
+        cp -R ${HOME}/.m2/repository/* "${mvn_local_repo}"
     fi
 
     cd ${build_target_dir}