Skip to content

Commit 982c545

Browse files
nikita15pguluo2016sandeep318kumarzRainscoldless177
authored
AMBARI-26303: Rebase trunk branch onto frontend-refactor (#3937)
* AMBARI-26232 There will be failure when executing shell.py and wrong order of imports for WidgetResourceProvider.java (#3872) * There will be failure when executing shell.py * Wrong order of imports for WidgetResourceProvider.java * Fix issue of test failure * AMBARI-26234: ClusterNotFoundException in stage Confirm Hosts during deploying a cluster #3875 * AMBARI-26184: Resolve snakeyaml 1.12 CVE #3869 * AMBARI-26235: Unable to check firewalld status when setup ambari #3878 * AMBARI-26195: Ambari database page not wokring after JQ upgrade #3885 * AMBARI-26239: Fix OozieUtils (#3894) * AMBARI-26239: Fix OozieUtils * AMBARI-26205: Dropdown menu flex layout overflow #3895 * AMBARI-26236: The database password character type requirement is too few (#3883) * The database password character type requirement is too few * Add more special characters, and add UT for this case * Update test case * AMBARI-26240: Fix alter dispatcher (#3896) * AMBARI-26241: _threadlocal has no uid because it is always None #3898 * AMBARI-26243: refactor: convert .format() to f-strings #3899 * AMBARI-26244: convert .format() to f-strings for ambari-server #3901 * AMBARI-26245: refactor(ambari-agent): convert .format() to f-strings (#3902) * AMBARI-26249: Timeline Service v2 failed to start because of unable to create leveldb state store directory #3905 * AMBARI-26247: convert .format() to f-strings for ambari-contrib #3903 * Update the KEYS File * AMBARI-26253: Can't download all client configs (#3906) * AMBARI-26257: Create new Configuration Group now worked #3907 * AMBARI-26248: Timeline Service Reader failed to start if hbase is not installed #3904 * AMBARI-26147: Add Ruff integration to ambari (#3908) * add ruff check files * add formatted code * AMBARI-26251: tooltip display issue #3911 * AMBARI-26207: Metrics sortable not work #3912 * AMBARI-26255: fix can't add capacity-scheduler views (#3913) * AMBARI-26270: Add quicklink of hiveserver2 web ui #3918 * AMBARI-26142: JDK17 support for Ambari Co-authored-by: Mohammad Arshad <[email protected]> (#3851) * AMBARI-26204: Migrate RecommendationResourceProviderTest from EasyMoc… (#3860) * AMBARI-26204: Migrate RecommendationResourceProviderTest from EasyMock to Mockito * AMBARI-26203: Fix annotation processing issue in ConfigurationTest after JDK 17 upgrade (#3859) * AMBARI-26203: Fix testAllPropertiesHaveMarkdownDescriptions failed * AMBARI-26212: Fix checkstyle error (#3862) * Ambari-26211: Fix TaskActionScheduler test failed (#3861) * AMBARI-26211: Fix TaskActionScheduler test failed * AMBARI-26215: Fix BlueprintConfigurationProcessorTest and others (#3863) * AMBARI-26215: Fix BlueprintConfigurationProcessorTest and others * AMBARI-26220: Fix ConfigureClusterTaskTest Unexpected method calls: ClusterConfigurationRequest.getRequiredHostGroups() error (#3864) fix AsyncCallableServiceTest Unexpected method calls: Callable.call() error * AMBARI-26221: Fix StackAdvisorCommandTest error,remove unnecessary code. (#3865) * AMBARI-26222: Fix ClientConfigResourceProviderTest & PreUpgradeCheckResourceProviderTest& ExecutionSchedulerTest& AmbariProxiedUserDetailsServiceTest * AMBARI-26233: Fix ambari-env.sh after jdk upgrade (#3873) * fix ambari agent env after jdk upgrade * AMBARI-26238: Add Ambari Java Home configuration for JDK 17 in Ambari… (#3891) * AMBARI-26238: Add Ambari Java Home configuration for JDK 17 in Ambari server * AMBARI-26268: Remove default value for ambari-java-home in ambari-server.py to fix setup handling #3915 Co-authored-by: tongxiaojun <[email protected]> * AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters #3917 * AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters --------- Co-authored-by: tongxiaojun <[email protected]> * AMBARI-26249: Addendum, adjusting the location of creating directory code (#3920) * AMBARI-26271: Invalid parameter was provided when using shell.call in HostInfo.py #3919 * AMBARI-26273: Add Oceanbase Support to Ambari MySQL DDL #3921 Co-authored-by: tongxiaojun <[email protected]> * AMBARI-26275: NoClassesFoundToAnalyzeException when compiling ambari with jdk17 #3924 * AMBARI-25848 : Need to update org.codehaus.jackson:jackson-mapper-asl dependency (#3922) Issue: Need to update org.codehaus.jackson:jackson-mapper-asl dependency. Cause: the library has been moved to com.fasterxml.jackson.core » jackson-databind, hence to keep up with the newer versions need to update the library dependency. Changes made: to update the jackson-mapper-asl dependency to jackson-databind and the required library version upgrades Co-authored-by: Vishal Suvagia <[email protected]> * AMBARI-26276: fix hdfs web service check (#3925) * AMBARI-26277:fix kerberos encryption error (#3926) * AMBARI-26279: ambari-agent prints logs that netstat command not found #3928 * AMBARI-26286: refactor(ambari-ruff): convert .format() to f-strings #3927 AMBARI-26286: refactor(ambari-ruff): convert .format() to f-strings * AMBARI-26055: Add alluxio support (#3934) * add alluxio service Co-authored-by: jialiang <[email protected]> * fix license --------- Co-authored-by: jialiang <[email protected]> * AMBARI-26185: Upgrade commons-collections to resolve CVEs (#3936) --------- Co-authored-by: Peng Lu <[email protected]> Co-authored-by: Sandeep Kumar <[email protected]> Co-authored-by: zrain <[email protected]> Co-authored-by: coldless177 <[email protected]> Co-authored-by: jialiang <[email protected]> Co-authored-by: yaruyng <[email protected]> Co-authored-by: tongxiaojun <[email protected]> Co-authored-by: tongxiaojun <[email protected]> Co-authored-by: Vishal Suvagia <[email protected]> Co-authored-by: Vishal Suvagia <[email protected]>
1 parent e5c9eef commit 982c545

File tree

1,290 files changed

+118435
-77611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,290 files changed

+118435
-77611
lines changed

Jenkinsfile

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pipeline {
4444

4545
tools {
4646
maven 'maven_3_latest'
47-
jdk 'jdk_1.8_latest'
47+
jdk 'jdk_17_latest'
4848
}
4949

5050
environment {
@@ -55,6 +55,24 @@ pipeline {
5555
}
5656

5757
stages {
58+
stage('Find and Run Ruff') {
59+
steps {
60+
script {
61+
sh 'pip3 install --user ruff'
62+
echo "Contents of /home/jenkins/.local/bin:"
63+
sh 'ls -l /home/jenkins/.local/bin || echo "Directory not found"'
64+
}
65+
}
66+
}
67+
68+
stage('Ruff Check') {
69+
steps {
70+
withEnv(["PATH+LOCALBIN=/home/jenkins/.local/bin:${env.PATH}"]) {
71+
sh 'ruff --version'
72+
sh 'mvn exec:exec@ruff-check -Pruff-check -pl :ambari -DskipTests -Dmaven.install.skip=true'
73+
}
74+
}
75+
}
5876
stage('Pre-Build Deps') {
5977
parallel{
6078
stage('JIRA Integration') {

KEYS

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,3 +880,60 @@ N/zWncPZFHya0QfOEWBrHsF/N1evfirEqFeVlwIS8frJ7zZUekyCZtTlkhImp48d
880880
Y+wM7m/7Q8IXwnCfRl1ktbLw
881881
=TNQ6
882882
-----END PGP PUBLIC KEY BLOCK-----
883+
pub rsa4096 2024-11-20 [SC]
884+
DCD36877D7A57FFDFC29343CE33E3A690928A669
885+
uid [ultimate] Jialiang (CODE SIGNING KEY) <[email protected]>
886+
sub rsa4096 2024-11-20 [E]
887+
888+
-----BEGIN PGP PUBLIC KEY BLOCK-----
889+
890+
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
937+
dIlSNEfSnLL5KOOSp5+a/g==
938+
=Kh5s
939+
-----END PGP PUBLIC KEY BLOCK-----

ambari-admin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
</plugin>
191191
<plugin>
192192
<artifactId>maven-compiler-plugin</artifactId>
193-
<version>3.2</version>
193+
<version>3.5</version>
194194
</plugin>
195195
<plugin>
196196
<artifactId>maven-assembly-plugin</artifactId>

0 commit comments

Comments
 (0)