From 11f86544dcf1658f59c757d92cb5c541dcc0675c Mon Sep 17 00:00:00 2001 From: Tiago Bento Date: Tue, 24 Sep 2024 10:09:46 -0400 Subject: [PATCH] Make it work as the repo is expecting --- packages/sonataflow-builder-image/env/index.js | 2 +- packages/sonataflow-builder-image/install.js | 2 +- packages/sonataflow-builder-image/package.json | 2 +- packages/sonataflow-devmode-image/env/index.js | 2 +- packages/sonataflow-devmode-image/install.js | 2 +- packages/sonataflow-devmode-image/package.json | 2 +- packages/sonataflow-operator/env/index.js | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/sonataflow-builder-image/env/index.js b/packages/sonataflow-builder-image/env/index.js index 36e3cc1181e..a2032324056 100644 --- a/packages/sonataflow-builder-image/env/index.js +++ b/packages/sonataflow-builder-image/env/index.js @@ -46,7 +46,7 @@ module.exports = composeEnv([rootEnv], { registry: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__registry), account: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__account), name: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__name), - buildTag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag), + tag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag), }, }; }, diff --git a/packages/sonataflow-builder-image/install.js b/packages/sonataflow-builder-image/install.js index 00f6c3a3bbf..b3a511cbcc0 100644 --- a/packages/sonataflow-builder-image/install.js +++ b/packages/sonataflow-builder-image/install.js @@ -33,7 +33,7 @@ const activateCmd = execSync( `${activateCmd} && \ - python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.buildTag} --source-folder ./resources`, + python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.tag} --source-folder ./resources`, { stdio: "inherit" } ); diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json index 3c4463d089e..2994231beba 100644 --- a/packages/sonataflow-builder-image/package.json +++ b/packages/sonataflow-builder-image/package.json @@ -27,7 +27,7 @@ "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", - "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)", + "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)", "test": "run-script-os", "test:cleanup": "mv dist-tests/report.xml dist-tests/junit-report.xml || true", "test:linux:darwin": "run-script-if --bool \"$(build-env tests.run)\" --then \"pnpm test:setup\" \"pnpm test:run\" --finally \"pnpm test:cleanup\"", diff --git a/packages/sonataflow-devmode-image/env/index.js b/packages/sonataflow-devmode-image/env/index.js index 6b741da955c..c67f4995769 100644 --- a/packages/sonataflow-devmode-image/env/index.js +++ b/packages/sonataflow-devmode-image/env/index.js @@ -51,7 +51,7 @@ module.exports = composeEnv([rootEnv], { registry: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__registry), account: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__account), name: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__name), - buildTag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag), + tag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag), sonataflowQuarkusDevUiVersion: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion), }, }; diff --git a/packages/sonataflow-devmode-image/install.js b/packages/sonataflow-devmode-image/install.js index f701da5c030..de22bb2875c 100644 --- a/packages/sonataflow-devmode-image/install.js +++ b/packages/sonataflow-devmode-image/install.js @@ -33,7 +33,7 @@ const activateCmd = execSync( `${activateCmd} && \ - python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.buildTag} --source-folder ./resources`, + python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.tag} --source-folder ./resources`, { stdio: "inherit" } ); diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json index 4a2843d4a25..69e5c6d828d 100644 --- a/packages/sonataflow-devmode-image/package.json +++ b/packages/sonataflow-devmode-image/package.json @@ -28,7 +28,7 @@ "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", - "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)" + "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)" }, "devDependencies": { "@kie-tools/python-venv": "workspace:*", diff --git a/packages/sonataflow-operator/env/index.js b/packages/sonataflow-operator/env/index.js index d4eea4efd23..bb7dff616d4 100644 --- a/packages/sonataflow-operator/env/index.js +++ b/packages/sonataflow-operator/env/index.js @@ -42,11 +42,11 @@ module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv, sonataflowDevMo description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0", }, SONATAFLOW_OPERATOR__sonataflowBuilderImage: { - default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.buildTag}`, + default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.tag}`, description: "Sonataflow Builder image", }, SONATAFLOW_OPERATOR__sonataflowDevModeImage: { - default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.buildTag}`, + default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.tag}`, description: "Sonataflow DevMode image", }, }),