From ccc9e94d851c244d815dd1a7fe1f11ddea06d7a8 Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 00:03:47 +0800 Subject: [PATCH 1/6] fix(plc4py): Add to Jenkins build --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c0a07f8fcf9..8e0c83296f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { } steps { echo 'Building' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' } post { always { @@ -117,7 +117,7 @@ pipeline { // We'll deploy to a relative directory so we can save // that and deploy in a later step on a different node - sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' + sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' // Stash the build results so we can deploy them on another node stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**' @@ -138,7 +138,7 @@ pipeline { echo 'Checking Code Quality on SonarCloud' withCredentials([string(credentialsId: 'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) { //sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-python,with-proxies sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' } } } From 00368bb23b53fb4f7d644cffce8bbbf63ff4dcac Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 01:17:51 +0800 Subject: [PATCH 2/6] Revert "fix(plc4py): Add to Jenkins build" This reverts commit ccc9e94d851c244d815dd1a7fe1f11ddea06d7a8. --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e0c83296f6..c0a07f8fcf9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { } steps { echo 'Building' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' } post { always { @@ -117,7 +117,7 @@ pipeline { // We'll deploy to a relative directory so we can save // that and deploy in a later step on a different node - sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' + sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' // Stash the build results so we can deploy them on another node stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**' @@ -138,7 +138,7 @@ pipeline { echo 'Checking Code Quality on SonarCloud' withCredentials([string(credentialsId: 'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) { //sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-python,with-proxies sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' } } } From ec9625130fa1351c302eeee1485f94181b4bd7b7 Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 01:42:43 +0800 Subject: [PATCH 3/6] Reapply "fix(plc4py): Add to Jenkins build" This reverts commit 00368bb23b53fb4f7d644cffce8bbbf63ff4dcac. --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c0a07f8fcf9..8e0c83296f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { } steps { echo 'Building' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' } post { always { @@ -117,7 +117,7 @@ pipeline { // We'll deploy to a relative directory so we can save // that and deploy in a later step on a different node - sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' + sh './mvnw -U -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python,update-generated-code,enable-all-checks ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' // Stash the build results so we can deploy them on another node stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**' @@ -138,7 +138,7 @@ pipeline { echo 'Checking Code Quality on SonarCloud' withCredentials([string(credentialsId: 'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) { //sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-python,with-proxies sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}' - sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' + sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-c,with-go,with-java,with-python sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.token=${SONAR_TOKEN}' } } } From 7fc2b33e2caee2706b8e7ea5b6583e1c87cec7b4 Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 01:52:41 +0800 Subject: [PATCH 4/6] fix: Update documentation on generating an otp on the build vm --- src/site/asciidoc/developers/infrastructure/vm.adoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/site/asciidoc/developers/infrastructure/vm.adoc b/src/site/asciidoc/developers/infrastructure/vm.adoc index 6c460fe380c..a42a8d8b705 100644 --- a/src/site/asciidoc/developers/infrastructure/vm.adoc +++ b/src/site/asciidoc/developers/infrastructure/vm.adoc @@ -73,7 +73,11 @@ Instead of now entering a password, a challenge is displayed: If you now enter your normal password, you'll simply get `permission denied` errors. -In order to execute operations as root on the machine, you need to use an opie client. +In order to execute operations as root on the machine, you firstly need to run ortpasswd to generate a new seed. + + ortpasswd + +You can then use an opie client on your local machine or online at https://selfserve.apache.org/otp-calculator.html otp-md5 496 pl8230 @@ -88,6 +92,8 @@ Now all you need to do is copy & paste that as password into your SSH client ses TIP: As with the latest version of Mac Catalina the existing clients no longer work and using a public web service is a bad idea, Apache has its own service to calculate it: https://selfserve.apache.org/otp-calculator.html +TIP: More help can be found for Apache committers at https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=122916896 + === Required software For being able to build the charts and graphics as part of the site generation, we need to add some additional packages: From 07627b8f4edbb50b9f4cc8d94637abde84499b99 Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 02:27:06 +0800 Subject: [PATCH 5/6] fix(plc4py): add 3.8 to github action --- .github/workflows/python-platform.yml | 2 +- .../unit/plc4py/utils/ParserSerializerTestSuiteRunner.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-platform.yml b/.github/workflows/python-platform.yml index 74173fa19fa..ee292b813a4 100644 --- a/.github/workflows/python-platform.yml +++ b/.github/workflows/python-platform.yml @@ -48,7 +48,7 @@ jobs: test: strategy: matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.8', '3.10', '3.11', '3.12'] os: [ ubuntu-latest, macos-latest, windows-latest ] fail-fast: false runs-on: ${{ matrix.os }} diff --git a/plc4py/tests/unit/plc4py/utils/ParserSerializerTestSuiteRunner.py b/plc4py/tests/unit/plc4py/utils/ParserSerializerTestSuiteRunner.py index 1f1599dc920..cf1e7cb9972 100644 --- a/plc4py/tests/unit/plc4py/utils/ParserSerializerTestSuiteRunner.py +++ b/plc4py/tests/unit/plc4py/utils/ParserSerializerTestSuiteRunner.py @@ -27,7 +27,7 @@ import unittest from abc import ABC, abstractmethod from dataclasses import dataclass, field -from typing import List, Iterator, Any +from typing import List, Iterator, Any, Tuple from xml.etree import ElementTree from xsdata.formats.dataclass.parsers import XmlParser @@ -48,7 +48,7 @@ class XmlTestSuiteLoader(unittest.TestLoader, ABC): # test_suite_document: str - test_suite_document_xml: Iterator[tuple[str, Any]] = field(init=False) + test_suite_document_xml: Iterator[Tuple[str, Any]] = field(init=False) def __post_init__(self) -> None: # ElementTree.register_namespace('test', 'https://plc4x.apache.org/schemas/driver-testsuite.xsd') From b14932a675bddb92476a11d6471378bd7c28682a Mon Sep 17 00:00:00 2001 From: hutcheb Date: Sat, 31 Aug 2024 02:31:32 +0800 Subject: [PATCH 6/6] fix(plc4py): set gh build to use every even python release --- .github/workflows/python-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-platform.yml b/.github/workflows/python-platform.yml index ee292b813a4..971a4e8ba30 100644 --- a/.github/workflows/python-platform.yml +++ b/.github/workflows/python-platform.yml @@ -48,7 +48,7 @@ jobs: test: strategy: matrix: - python-version: ['3.8', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.10', '3.12'] os: [ ubuntu-latest, macos-latest, windows-latest ] fail-fast: false runs-on: ${{ matrix.os }}