From f152033835fff4c4c3c1d19eafcbb3a52362c8a9 Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Mon, 16 Dec 2019 16:02:12 -0700 Subject: [PATCH] Move CI settings into ci-settings repo Move azure jobs into ci-settings repo Move jobs into stages Remove steps from angr repo Remove custom branch from ci-settings resource --- .azure-pipelines/master.yml | 61 ++++---------------------- .azure-pipelines/nightly.yml | 56 ++++------------------- .azure-pipelines/steps/linux-build.yml | 15 ------- .azure-pipelines/steps/linux-lint.yml | 7 --- .azure-pipelines/steps/linux-test.yml | 27 ------------ 5 files changed, 16 insertions(+), 150 deletions(-) delete mode 100644 .azure-pipelines/steps/linux-build.yml delete mode 100644 .azure-pipelines/steps/linux-lint.yml delete mode 100644 .azure-pipelines/steps/linux-test.yml diff --git a/.azure-pipelines/master.yml b/.azure-pipelines/master.yml index 348cc87972e..cf18290f079 100644 --- a/.azure-pipelines/master.yml +++ b/.azure-pipelines/master.yml @@ -1,56 +1,11 @@ name: $(BuildDefinitionName)-$(SourceBranchName)-$(BuildID) -jobs: -- job: Build - pool: - vmImage: ubuntu-16.04 - container: - image: angr/ci:2 - steps: - - template: ./steps/linux-build.yml +resources: + repositories: + - repository: ci-settings + type: github + name: angr/ci-settings + endpoint: angr -- job: Lint - pool: - vmImage: ubuntu-16.04 - container: - image: angr/ci:2 - dependsOn: Build - condition: succeeded() - steps: - - template: ./steps/linux-lint.yml - -- job: Test - pool: - vmImage: ubuntu-16.04 - container: - image: angr/ci:2 - options: --cap-add=SYS_PTRACE --security-opt seccomp:unconfined - dependsOn: Build - condition: succeeded() - variables: - NUM_WORKERS: 10 - strategy: - maxParallel: 10 - matrix: - worker_0: - WORKER: 0 - worker_1: - WORKER: 1 - worker_2: - WORKER: 2 - worker_3: - WORKER: 3 - worker_4: - WORKER: 4 - worker_5: - WORKER: 5 - worker_6: - WORKER: 6 - worker_7: - WORKER: 7 - worker_8: - WORKER: 8 - worker_9: - WORKER: 9 - steps: - - template: ./steps/linux-test.yml +stages: +- template: resources/master.yml@ci-settings diff --git a/.azure-pipelines/nightly.yml b/.azure-pipelines/nightly.yml index 571f80d7bd3..311bbcb7463 100644 --- a/.azure-pipelines/nightly.yml +++ b/.azure-pipelines/nightly.yml @@ -8,52 +8,12 @@ schedules: include: - master -jobs: -- job: Build - pool: - vmImage: ubuntu-16.04 - container: - image: angr/ci:2 - steps: - - template: ./steps/linux-build.yml - parameters: - nightly: True - -- job: Test - pool: - vmImage: ubuntu-16.04 - container: - image: angr/ci:2 - options: --cap-add=SYS_PTRACE --security-opt seccomp:unconfined - dependsOn: Build - condition: succeeded() - variables: - NUM_WORKERS: 10 - strategy: - maxParallel: 10 - matrix: - worker_0: - WORKER: 0 - worker_1: - WORKER: 1 - worker_2: - WORKER: 2 - worker_3: - WORKER: 3 - worker_4: - WORKER: 4 - worker_5: - WORKER: 5 - worker_6: - WORKER: 6 - worker_7: - WORKER: 7 - worker_8: - WORKER: 8 - worker_9: - WORKER: 9 - steps: - - template: ./steps/linux-test.yml - parameters: - nightly: True +resources: + repositories: + - repository: ci-settings + type: github + name: angr/ci-settings + endpoint: angr +stages: +- template: resources/nightly.yml@ci-settings diff --git a/.azure-pipelines/steps/linux-build.yml b/.azure-pipelines/steps/linux-build.yml deleted file mode 100644 index e6562e19930..00000000000 --- a/.azure-pipelines/steps/linux-build.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - nightly: false - -steps: -- checkout: none - -- script: /root/scripts/azure-build.sh nightly - condition: eq('${{ parameters.nightly }}', 'true') -- script: /root/scripts/azure-build.sh - condition: eq('${{ parameters.nightly }}', 'false') - -- task: PublishPipelineArtifact@0 - inputs: - artifactName: "build_archive" - targetPath: ./build.tar.gz diff --git a/.azure-pipelines/steps/linux-lint.yml b/.azure-pipelines/steps/linux-lint.yml deleted file mode 100644 index 114c0357f83..00000000000 --- a/.azure-pipelines/steps/linux-lint.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- task: DownloadPipelineArtifact@0 - inputs: - artifactName: "build_archive" - targetPath: . - -- script: /root/scripts/azure-lint.sh diff --git a/.azure-pipelines/steps/linux-test.yml b/.azure-pipelines/steps/linux-test.yml deleted file mode 100644 index dc247c8d8b8..00000000000 --- a/.azure-pipelines/steps/linux-test.yml +++ /dev/null @@ -1,27 +0,0 @@ -parameters: - nightly: false - -steps: -- task: DownloadPipelineArtifact@0 - inputs: - artifactName: "build_archive" - targetPath: . - -- script: /root/scripts/azure-test.sh nightly - condition: eq('${{ parameters.nightly }}', 'true') -- script: /root/scripts/azure-test.sh - condition: eq('${{ parameters.nightly }}', 'false') - -- task: PublishTestResults@2 - condition: succeededOrFailed() - inputs: - testRunner: "JUnit" - testResultsFiles: "build/results/*.tests.xml" - mergeTestResults: true - -- task: PublishCodeCoverageResults@1 - condition: eq(${{ parameters.nightly }}, 'true') - inputs: - codeCoverageTool: "cobertura" - summaryFileLocation: "build/results/*.coverage.xml" - additionalCodeCoverageFiles: "build/results/*.coverage.xml"