Skip to content

Commit eb8032f

Browse files
committed
work libs removed and update build pipeline,remove appveyor
1 parent 5a72618 commit eb8032f

Some content is hidden

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

46 files changed

+157
-299
lines changed

appveyor.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

azure-pipelines-e2e-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ steps:
5353
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
5454
displayName: 'Build & Run tests for java 8'
5555
continueOnError: false
56-
56+
5757
- task: DotNetCoreCLI@2
5858
inputs:
5959
command: 'test'

azure-pipelines.yml

Lines changed: 147 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -2,158 +2,163 @@
22
# Start with a minimal pipeline that you can customize to build and deploy your code.
33
# Add steps that build, run tests, deploy, and more:
44

5-
pool:
6-
vmImage: 'windows-2019'
5+
76
trigger:
7+
tags:
8+
include:
9+
- '*'
810
branches:
911
include:
1012
- dev
11-
- master
12-
- v4
13+
- v3.x
14+
- release/3.x
15+
- release/main
1316
pr:
1417
branches:
1518
include:
1619
- dev
17-
- v4
20+
- v3.x
21+
- release/3.x
22+
- release/main
23+
24+
25+
jobs:
26+
- job: "Build_And_Test_Java_Worker_Windows"
27+
pool:
28+
vmImage: 'windows-2019'
1829

19-
steps:
20-
- task: NuGetToolInstaller@1
21-
inputs:
22-
checkLatest: true
23-
- pwsh: |
24-
Get-Command mvn
25-
displayName: 'Check Maven is installed'
26-
- pwsh: |
27-
$buildNumber = 0
28-
if($env:APPVEYOR_REPO_TAG -eq "true") {
29-
$buildNumber = $(Build.SourceBranchName)
30-
Write-Host "Found git tag."
31-
}
32-
else {
33-
$buildNumber = "1.8.2-$(Build.BuildId)"
34-
Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
35-
}
36-
.\package-pipeline.ps1 -buildNumber $buildNumber
37-
displayName: 'Executing build script'
38-
- task: CopyFiles@2
39-
inputs:
40-
SourceFolder: '$(Build.Repository.LocalPath)/pkg'
41-
Contents: '*.nupkg'
42-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
43-
CleanTargetFolder: true
44-
displayName: 'Copying files for artifacts'
45-
- pwsh: |
46-
.\setup-tests-pipeline.ps1
47-
displayName: 'Setup test environment -- Install the Core Tools'
30+
variables:
31+
${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
32+
isTagTemp: true
33+
isTag: $[variables.isTagTemp]
4834

49-
- pwsh: |
50-
$currDir = Get-Location
51-
$Env:Path = $Env:Path+";$currDir\Azure.Functions.Cli"
52-
ls $currDir\Azure.Functions.Cli
53-
func --version
54-
cd ./endtoendtests
55-
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
56-
Copy-Item "confluent_cloud_cacert.pem" ".\target\azure-functions\azure-functions-java-endtoendtests"
57-
displayName: 'Package Java for E2E'
58-
- task: DotNetCoreCLI@2
59-
inputs:
60-
command: 'test'
61-
projects: |
62-
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
63-
env:
64-
AzureWebJobsStorage: $(AzureWebJobsStorage)
65-
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
66-
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
67-
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
68-
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
69-
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
70-
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
71-
SBTopicName: $(SBTopicName)
72-
SBTopicSubName: $(SBTopicSubName)
73-
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
74-
SBQueueName: $(SBQueueName)
75-
BrokerList": $(BrokerList)
76-
ConfluentCloudUsername: $(ConfluentCloudUsername)
77-
ConfluentCloudPassword: $(ConfluentCloudPassword)
78-
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
79-
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
80-
displayName: 'Build & Run tests for java 8'
81-
continueOnError: false
35+
steps:
36+
- task: NuGetToolInstaller@1
37+
inputs:
38+
checkLatest: true
39+
- pwsh: |
40+
Get-Command mvn
41+
displayName: 'Check Maven is installed'
42+
- pwsh: |
43+
if ("$(isTag)"){
44+
$buildNumber="$(Build.SourceBranchName)"
45+
Write-Host "Found git tag."
46+
}
47+
else {
48+
$buildNumber="1.8.2-$(Build.BuildNumber)"
49+
Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
50+
}
51+
.\package-pipeline.ps1 -buildNumber $buildNumber
52+
displayName: 'Executing build script'
53+
- task: CopyFiles@2
54+
inputs:
55+
SourceFolder: '$(Build.Repository.LocalPath)/pkg'
56+
Contents: '*.nupkg'
57+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
58+
CleanTargetFolder: true
59+
displayName: 'Copying files for artifacts'
60+
- pwsh: |
61+
.\setup-tests-pipeline.ps1
62+
displayName: 'Setup test environment -- Install the Core Tools'
63+
- pwsh: |
64+
$currDir = Get-Location
65+
$Env:Path = $Env:Path+";$currDir\Azure.Functions.Cli"
66+
ls $currDir\Azure.Functions.Cli
67+
func --version
68+
cd ./endtoendtests
69+
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
70+
Copy-Item "confluent_cloud_cacert.pem" ".\target\azure-functions\azure-functions-java-endtoendtests"
71+
displayName: 'Package Java for E2E'
72+
- task: DotNetCoreCLI@2
73+
inputs:
74+
command: 'test'
75+
projects: |
76+
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
77+
env:
78+
AzureWebJobsStorage: $(AzureWebJobsStorage)
79+
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
80+
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
81+
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
82+
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
83+
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
84+
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
85+
SBTopicName: $(SBTopicName)
86+
SBTopicSubName: $(SBTopicSubName)
87+
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
88+
SBQueueName: $(SBQueueName)
89+
BrokerList": $(BrokerList)
90+
ConfluentCloudUsername: $(ConfluentCloudUsername)
91+
ConfluentCloudPassword: $(ConfluentCloudPassword)
92+
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
93+
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
94+
displayName: 'Build & Run tests for java 8'
95+
continueOnError: false
8296

83-
- task: DotNetCoreCLI@2
84-
inputs:
85-
command: 'test'
86-
projects: |
87-
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
88-
env:
89-
FUNCTIONS_WORKER_JAVA_LOAD_APP_LIBS: 'True'
90-
AzureWebJobsStorage: $(AzureWebJobsStorage)
91-
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
92-
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
93-
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
94-
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
95-
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
96-
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
97-
SBTopicName: $(SBTopicName)
98-
SBTopicSubName: $(SBTopicSubName)
99-
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
100-
SBQueueName: $(SBQueueName)
101-
BrokerList": $(BrokerList)
102-
ConfluentCloudUsername: $(ConfluentCloudUsername)
103-
ConfluentCloudPassword: $(ConfluentCloudPassword)
104-
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
105-
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
106-
displayName: 'Build & Run tests for java 8 Customer jar loaded first'
107-
continueOnError: false
108-
- pwsh: |
109-
$JAVA_VERSION="zulu11.33.15-ca-jdk11.0.4-win_x64"
110-
Invoke-WebRequest "https://cdn.azul.com/zulu/bin/$JAVA_VERSION.zip" -O "$JAVA_VERSION.zip"
111-
Expand-Archive -Force "$JAVA_VERSION.zip" .
112-
cd $JAVA_VERSION
113-
$current = get-location | select -ExpandProperty Path
114-
cd ..
115-
Write-Host "##vso[task.setvariable variable=Java11Home;]$current"
116-
displayName: 'Setup Java 11 SDK'
117-
continueOnError: false
97+
- task: DotNetCoreCLI@2
98+
inputs:
99+
command: 'test'
100+
projects: |
101+
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
102+
env:
103+
FUNCTIONS_WORKER_JAVA_LOAD_APP_LIBS: 'True'
104+
AzureWebJobsStorage: $(AzureWebJobsStorage)
105+
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
106+
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
107+
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
108+
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
109+
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
110+
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
111+
SBTopicName: $(SBTopicName)
112+
SBTopicSubName: $(SBTopicSubName)
113+
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
114+
SBQueueName: $(SBQueueName)
115+
BrokerList": $(BrokerList)
116+
ConfluentCloudUsername: $(ConfluentCloudUsername)
117+
ConfluentCloudPassword: $(ConfluentCloudPassword)
118+
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
119+
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
120+
displayName: 'Build & Run tests for java 8 Customer jar loaded first'
121+
continueOnError: false
118122

119-
- task: DotNetCoreCLI@2
120-
inputs:
121-
command: 'test'
122-
projects: |
123-
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
124-
env:
125-
JAVA_HOME: $(Java11Home)
126-
AzureWebJobsStorage: $(AzureWebJobsStorage)
127-
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
128-
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
129-
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
130-
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
131-
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
132-
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
133-
SBTopicName: $(SBTopicName)
134-
SBTopicSubName: $(SBTopicSubName)
135-
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
136-
SBQueueName: $(SBQueueName)
137-
BrokerList": $(BrokerList)
138-
ConfluentCloudUsername: $(ConfluentCloudUsername)
139-
ConfluentCloudPassword: $(ConfluentCloudPassword)
140-
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
141-
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
142-
displayName: 'Build & Run tests for java 11'
143-
continueOnError: false
144-
- task: PublishBuildArtifacts@1
145-
inputs:
146-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
147-
ArtifactName: 'drop'
148-
publishLocation: 'Container'
149-
displayName: 'Publishing build artifacts'
123+
- pwsh: |
124+
$JAVA_VERSION="zulu11.33.15-ca-jdk11.0.4-win_x64"
125+
Invoke-WebRequest "https://cdn.azul.com/zulu/bin/$JAVA_VERSION.zip" -O "$JAVA_VERSION.zip"
126+
Expand-Archive -Force "$JAVA_VERSION.zip" .
127+
cd $JAVA_VERSION
128+
$current = get-location | select -ExpandProperty Path
129+
cd ..
130+
Write-Host "##vso[task.setvariable variable=Java11Home;]$current"
131+
displayName: 'Setup Java 11 SDK'
132+
continueOnError: false
150133
151-
- task: NuGetCommand@2
152-
condition: eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], 'True')
153-
inputs:
154-
command: 'push'
155-
packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
156-
nuGetFeedType: 'internal'
157-
publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df'
158-
allowPackageConflicts: true
159-
displayName: 'Push NuGet package to the AzureFunctionsPreRelease feed'
134+
- task: DotNetCoreCLI@2
135+
inputs:
136+
command: 'test'
137+
projects: |
138+
endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
139+
env:
140+
JAVA_HOME: $(Java11Home)
141+
AzureWebJobsStorage: $(AzureWebJobsStorage)
142+
AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
143+
AzureWebJobsServiceBus: $(AzureWebJobsServiceBus)
144+
AzureWebJobsEventHubSender_2: $(AzureWebJobsEventHubSender_2)
145+
AzureWebJobsEventHubReceiver: $(AzureWebJobsEventHubReceiver)
146+
AzureWebJobsEventHubSender: $(AzureWebJobsEventHubSender)
147+
AzureWebJobsEventHubPath: $(AzureWebJobsEventHubPath)
148+
SBTopicName: $(SBTopicName)
149+
SBTopicSubName: $(SBTopicSubName)
150+
CosmosDBDatabaseName: $(CosmosDBDatabaseName)
151+
SBQueueName: $(SBQueueName)
152+
BrokerList": $(BrokerList)
153+
ConfluentCloudUsername: $(ConfluentCloudUsername)
154+
ConfluentCloudPassword: $(ConfluentCloudPassword)
155+
AzureWebJobsEventGridOutputBindingTopicUriString: $(AzureWebJobsEventGridOutputBindingTopicUriString)
156+
AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
157+
displayName: 'Build & Run tests for java 11'
158+
continueOnError: false
159+
- task: PublishBuildArtifacts@1
160+
inputs:
161+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
162+
ArtifactName: 'drop'
163+
publishLocation: 'Container'
164+
displayName: 'Publishing build artifacts'

endtoendtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/HttpEndToEndTests.cs

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,9 @@ public async Task HttpTrigger_ReturnsCustomCode()
4242
[Fact]
4343
public async Task HttpTriggerJavaClassLoader()
4444
{
45-
// The e2e project has newer jars than the one we use in the worker.
46-
// The purpose of this test will be called for three scenarios:
47-
// 1. Java 11 -- Client code takes presence. -- works fine.
48-
// 2. Java 8 with no Application settings, worker lib jars takes presence -- throw exception
49-
// 3. Java 8 with with Application settings, worker lib jars takes presence -- works fine.
50-
51-
String value = Environment.GetEnvironmentVariable("FUNCTIONS_WORKER_JAVA_LOAD_APP_LIBS");
52-
String java_home = Environment.GetEnvironmentVariable("JAVA_HOME");
53-
if (java_home.Contains("zulu11") || (value != null && value.ToLower().Equals("true")))
54-
{
55-
Assert.True(await Utilities.InvokeHttpTrigger("HttpTriggerJavaClassLoader", "?&name=Test", HttpStatusCode.OK, "Test"));
56-
}
57-
else
58-
{
59-
Assert.True(await Utilities.InvokeHttpTrigger("HttpTriggerJavaClassLoader", "?&name=Test", HttpStatusCode.InternalServerError, ""));
60-
}
45+
46+
Assert.True(await Utilities.InvokeHttpTrigger("HttpTriggerJavaClassLoader", "?&name=Test", HttpStatusCode.OK, "Test"));
47+
6148
}
6249
}
6350
}
Binary file not shown.
-3.05 KB
Binary file not shown.
-189 KB
Binary file not shown.

lib_worker_1.6.2/commons-cli-1.4.jar

-52.6 KB
Binary file not shown.
-492 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)