Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix stuff #21276

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/devops/automation/run-post-pr-build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ resources:
source: xamarin-macios-pr
trigger:
stages:
- build_packages
- build_macos_tests

extends:
Expand Down
61 changes: 2 additions & 59 deletions tools/devops/automation/templates/build/build-mac-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,62 +31,5 @@ parameters:
default: '$(MaciosUploadPrefix)'

steps:
- template: build.yml
parameters:
isPR: ${{ parameters.isPR }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
vsdropsPrefix: ${{ parameters.vsdropsPrefix }}
keyringPass: ${{ parameters.keyringPass }}
gitHubToken: ${{ parameters.gitHubToken }}
xqaCertPass: ${{ parameters.xqaCertPass }}
buildSteps:

# funny enough we need these profiles to build the mac tests
- bash: '"$BUILD_SOURCESDIRECTORY"/maccore/tools/install-qa-provisioning-profiles.sh -v'
displayName: 'Add tests provisioning profiles'
timeoutInMinutes: 30
continueOnError: true # should not stop the build will result in test failures but we do want the pkg
env:
AUTH_TOKEN_GITHUB_COM: ${{ parameters.gitHubToken }}
AUTH_TOKEN_LA_DEV_APPLE_P12: ${{ parameters.xqaCertPass }}
AUTH_TOKEN_LA_DISTR_APPLE_P12: ${{ parameters.xqaCertPass }}
AUTH_TOKEN_LA_MAC_INSTALLER_DISTR_P12: ${{ parameters.xqaCertPass }}
AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_P12: ${{ parameters.xqaCertPass }}
AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_2_P12: ${{ parameters.xqaCertPass }}

- bash: |
set -x
set -e

make -C $(Build.SourcesDirectory)/xamarin-macios/tests package-tests

if test -f "$(Build.SourcesDirectory)/xamarin-macios/tests/mac-test-package.7z"; then
set +x
echo "##vso[artifact.upload containerfolder=mac-test-package;artifactname=${{ parameters.uploadPrefix }}mac-test-package]$(Build.SourcesDirectory)/xamarin-macios/tests/mac-test-package.7z"
set -x
fi

name: macTestPkg
displayName: 'Package macOS tests'
condition: and(succeeded(), contains(variables['RUN_MAC_TESTS'], 'true'))
timeoutInMinutes: 60

- ${{ if eq(parameters.uploadBinlogs, true) }}:
# Copy all the binlogs to a separate directory, keeping directory structure.
- script: |
set -x
mkdir -p $(Build.ArtifactStagingDirectory)/mactests-binlogs
rsync -av --prune-empty-dirs --include '*/' --include '*.binlog' --exclude '*' $(Build.SourcesDirectory)/xamarin-macios $(Build.ArtifactStagingDirectory)/mactests-binlogs
displayName: Copy all binlogs
continueOnError: true
condition: succeededOrFailed()

# Publish all the binlogs we collected in the previous step
- task: 1ES.PublishPipelineArtifact@1
displayName: 'Publish Artifact: All binlogs'
inputs:
path: $(Build.ArtifactStagingDirectory)/mactests-binlogs
artifact: '${{ parameters.uploadPrefix }}mactests-binlogs-$(Build.BuildId)-$(System.StageAttempt)-$(System.JobAttempt)'
continueOnError: true
condition: succeededOrFailed()
- bash: echo "Let's do this real quick"
displayName: "Hurry up"
10 changes: 8 additions & 2 deletions tools/devops/automation/templates/tests/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ stages:
- stage: ${{ parameters.stageName }}
displayName: ${{ parameters.displayName }}
dependsOn:
- ${{ if eq(parameters.postPipeline, false) }}:
- build_packages
- configure_build
# we need to have the pkgs built and the device sets to be ran, that is decided via the labels or type of build during the build_packages stage
condition: and(succeeded(), ${{ parameters.condition }})
Expand Down Expand Up @@ -118,6 +116,14 @@ stages:
matrix: $[ stageDependencies.configure_build.configure.outputs['test_matrix.TEST_MATRIX'] ]
steps:

- bash: |
set -x
for repo in /Users/builder/azdo/_work/*/s/xamarin-macios; do echo $repo; cd $repo; ls -la; git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" || true; done
for repo in /Users/builder/azdo/_work/*/s/xamarin-macios; do cd $repo; git fetch origin; done
exit 1
displayName: 'Fix stuff'
name: FixStuff

- bash: |
env | sort
env
Expand Down