Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sruehl committed Aug 31, 2024
2 parents d92d1f3 + b14932a commit 5eaaf47
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
test:
strategy:
matrix:
python-version: ['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 }}
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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/**'
Expand All @@ -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}'
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down
8 changes: 7 additions & 1 deletion src/site/asciidoc/developers/infrastructure/vm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down

0 comments on commit 5eaaf47

Please sign in to comment.