diff --git a/.pipelines/run-pipeline.yaml b/.pipelines/run-pipeline.yaml index 32cd39eafd..3056bc85a7 100644 --- a/.pipelines/run-pipeline.yaml +++ b/.pipelines/run-pipeline.yaml @@ -51,51 +51,6 @@ stages: name: "EnvironmentalVariables" displayName: "Set environmental variables" - - job: resources - displayName: "[Infra] Configure Build Resources" - variables: - ACNCI_BUILDUSER_ROLE_NAME: "ACN CI/CD Build Environment Owner" - ACNCI_MANAGEDIDENTITY_PREFIX: acnci-builds- - ACNCI_RG_PREFIX: acnci-builds- - ACNCI_RG_LOCATION: centralus - ACNCI_RG_POOL_SIZE: 3 - ACNCI_SA_PREFIX: acnci - ACNCI_SA_LOCATION: $(ACNCI_RG_LOCATION) - ACNCI_SA_POOL_SIZE: 1 - ACNCI_BUILDTAG_DEFINITIONID: 'Pipelines.DefinitionID' - ACNCI_BUILDTAG_CREATEDBYAPPID: 'Pipelines.CreatedByAppID' - ACNCI_BUILDTAG_CREATEDBYBUILDID: 'Pipelines.CreatedByBuildID' - CREATE_NEW_SA: False - ob_outputDirectory: $(Build.ArtifactStagingDirectory) - ob_git_checkout: true - pool: - type: linux - steps: - - checkout: ACNTools - clean: true - - - task: AzureCLI@2 - displayName: "[Test] Service Connection" - inputs: - azureSubscription: $(ACNCI_BUILDUSER_SERVICECONNECTION_NAME) - scriptType: bash - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - echo "OK." - - - task: AzureCLI@2 - displayName: "[Test] Service Connection" - inputs: - azureSubscription: $(ACN_TEST_SERVICE_CONNECTION) - scriptType: bash - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - echo "OK." - - - template: templates/artifact-storage.steps.yaml@ACNTools - - template: templates/unit-tests.stages.yaml@ACNTools - ${{ if not(contains(parameters.triggerBuildSourceBranch, 'refs/pull')) }}: @@ -106,9 +61,6 @@ stages: - test variables: ACN_DIR: $(Build.SourcesDirectory) - SA_NAME: $[ stageDependencies.setup.resources.outputs['artifact_storage.ACNCI_STORAGEACCOUNT_NAME'] ] - CONTAINER_NAME: $[ stageDependencies.setup.resources.outputs['artifact_container.ACNCI_STORAGEACCOUNT_ARTIFACT_CONTAINER'] ] - BLOB_PATH: $[ stageDependencies.setup.resources.outputs['artifact_blob.ACNCI_STORAGEACCOUNT_BLOBPATH'] ] jobs: - job: build displayName: Build Binaries @@ -116,8 +68,6 @@ stages: STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ] ob_outputDirectory: $(Build.ArtifactStagingDirectory) ob_git_checkout: true - ob_artifactSuffix: $(System.JobAttempt) - ob_artifactBaseName: drop_binaries_build pool: isCustom: true type: linux @@ -134,7 +84,6 @@ stages: workingDirectory: $(ACN_DIR) - script: | - mkdir -p ./output/bins cd ./output find . -name '*.tgz' -print -exec mv -t ./bins/ {} + find . -name '*.zip' -print -exec mv -t ./bins/ {} + @@ -142,38 +91,12 @@ stages: rm -rf !("bins") name: "PrepareArtifacts" displayName: "Prepare Artifacts" - - - template: templates/copy-storage-artifacts.steps.yaml@ACNTools - parameters: - targetFolder: binary-output - sourceFolder: $(Build.ArtifactStagingDirectory) - - - job: - displayName: "[Publish] Generate Binary Artifacts" - dependsOn: - - build - pool: - type: linux - variables: - blobName: binary-output - ob_outputDirectory: $(Build.ArtifactStagingDirectory) - ob_git_checkout: true - steps: - - checkout: ACNTools - clean: true - - - template: templates/download-storage-artifacts.steps.yaml - parameters: - artifactName: binary-output -# - publish: ${Build.ArtifactStagingDirectory) -# artifact: drop_binaries_build -# condition: succeeded() -# - task: CopVyFiles@2 -# inputs: -# sourceFolder: "output" -# targetFolder: $(Build.ArtifactStagingDirectory) -# condition: succeeded() + - task: CopyFiles@2 + inputs: + sourceFolder: "output" + targetFolder: $(Build.ArtifactStagingDirectory) + condition: succeeded() - stage: containerize