Skip to content

Commit a2d6312

Browse files
authored
Merge pull request rundeck#2556 from variacode/feature/add-batix-plugin
Include Batix/rundeck-ansible-plugin
2 parents 9682031 + ebe09c9 commit a2d6312

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

rundeckapp/build.gradle

+7-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ configurations{
7070
}
7171
pluginFiles.extendsFrom(runtime)
7272
}
73-
73+
allprojects {
74+
repositories {
75+
maven { url "https://jitpack.io" }
76+
}
77+
}
7478
dependencies {
7579
pluginFiles project(':plugins:script-plugin'),
7680
project(':plugins:stub-plugin'),
@@ -81,7 +85,8 @@ dependencies {
8185
project(':plugins:jasypt-encryption-plugin'),
8286
project(':plugins:orchestrator-plugin'),
8387
project(':plugins:git-plugin'),
84-
project(':plugins:source-refresh-plugin')
88+
project(':plugins:source-refresh-plugin'),
89+
"com.github.Batix:rundeck-ansible-plugin:2.0.2"
8590
}
8691

8792
task('copyPluginLibs').dependsOn(configurations.pluginFiles).doLast {

testbuild.groovy

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ args.each{
3535
def tag="-SNAPSHOT"
3636
if(props.'release'){
3737
tag= props.releaseTag && props.releaseTag!='GA' ? '-'+props.releaseTag : ''
38-
}
38+
}
3939
def debug=Boolean.getBoolean('debug')?:("-debug" in args)
4040
def version=props.currentVersion+tag
4141
//versions of dependency we want to verify
@@ -51,6 +51,7 @@ def launcherJarFile = "rundeck-launcher/launcher/${target}/rundeck-launcher-${ve
5151

5252
//the list of bundled plugins to verify in the war and jar
5353
def plugins=['script','stub','localexec','copyfile','job-state','flow-control','jasypt-encryption','git','orchestrator', 'source-refresh']
54+
def externalPlugins=['rundeck-ansible-plugin']
5455

5556
//manifest describing expected build results
5657
def manifest=[
@@ -127,6 +128,9 @@ plugins.each{plugin->
127128
])
128129
pluginsum+=2
129130
}
131+
externalPlugins.each{plugin->
132+
pluginsum+=2
133+
}
130134
//require correct plugin files count in dir
131135
manifest.get(launcherJarFile).add("pkgs/webapp/WEB-INF/rundeck/plugins/#${pluginsum}")
132136

@@ -163,7 +167,7 @@ getSha256={fis->
163167

164168
byte[] dataBytes = new byte[1024];
165169

166-
int nread = 0;
170+
int nread = 0;
167171
while ((nread = fis.read(dataBytes)) != -1) {
168172
md.update(dataBytes, 0, nread);
169173
};

0 commit comments

Comments
 (0)