parent
6aebbec270
commit
f1e32b989d
|
@ -276,7 +276,7 @@ stages:
|
||||||
targetPath: 'output-integration/'
|
targetPath: 'output-integration/'
|
||||||
artifact: 'coverage-integration'
|
artifact: 'coverage-integration'
|
||||||
publishLocation: 'pipeline'
|
publishLocation: 'pipeline'
|
||||||
- job: coverage_e2e_chrome
|
- job: coverage_e2e
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'ubuntu-latest'
|
vmImage: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
|
@ -331,90 +331,20 @@ stages:
|
||||||
displayName: Prepare unittests and coverage for upload
|
displayName: Prepare unittests and coverage for upload
|
||||||
inputs:
|
inputs:
|
||||||
script: |
|
script: |
|
||||||
mkdir output-e2e-chrome
|
mkdir output-e2e
|
||||||
mv unittest.xml output-e2e-chrome/unittest.xml
|
mv unittest.xml output-e2e/unittest.xml
|
||||||
mv .coverage output-e2e-chrome/coverage
|
mv .coverage output-e2e/coverage
|
||||||
- task: PublishPipelineArtifact@1
|
- task: PublishPipelineArtifact@1
|
||||||
condition: failed()
|
condition: failed()
|
||||||
displayName: Upload screenshots if selenium tests fail
|
displayName: Upload screenshots if selenium tests fail
|
||||||
inputs:
|
inputs:
|
||||||
targetPath: 'selenium_screenshots/'
|
targetPath: 'selenium_screenshots/'
|
||||||
artifact: 'chrome selenium screenshots'
|
artifact: 'selenium screenshots'
|
||||||
publishLocation: 'pipeline'
|
publishLocation: 'pipeline'
|
||||||
- task: PublishPipelineArtifact@1
|
- task: PublishPipelineArtifact@1
|
||||||
inputs:
|
inputs:
|
||||||
targetPath: 'output-e2e-chrome/'
|
targetPath: 'output-e2e/'
|
||||||
artifact: 'coverage-e2e-chrome'
|
artifact: 'coverage-e2e'
|
||||||
publishLocation: 'pipeline'
|
|
||||||
- job: coverage_e2e_firefox
|
|
||||||
pool:
|
|
||||||
vmImage: 'ubuntu-latest'
|
|
||||||
steps:
|
|
||||||
- task: UsePythonVersion@0
|
|
||||||
inputs:
|
|
||||||
versionSpec: '3.9'
|
|
||||||
- task: NodeTool@0
|
|
||||||
inputs:
|
|
||||||
versionSpec: '16.x'
|
|
||||||
- task: DockerCompose@0
|
|
||||||
displayName: Run services
|
|
||||||
inputs:
|
|
||||||
dockerComposeFile: 'scripts/ci.docker-compose.yml'
|
|
||||||
action: 'Run services'
|
|
||||||
buildImages: false
|
|
||||||
- task: CmdLine@2
|
|
||||||
inputs:
|
|
||||||
script: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y libxmlsec1-dev pkg-config
|
|
||||||
sudo pip install -U wheel pipenv
|
|
||||||
pipenv install --dev --python python3.9
|
|
||||||
- task: DockerCompose@0
|
|
||||||
displayName: Run FirefoxDriver
|
|
||||||
inputs:
|
|
||||||
dockerComposeFile: 'tests/e2e/ci.docker-compose.yml'
|
|
||||||
action: 'Run a specific service'
|
|
||||||
serviceName: 'firefox'
|
|
||||||
- task: CmdLine@2
|
|
||||||
displayName: Build static files for e2e
|
|
||||||
inputs:
|
|
||||||
script: |
|
|
||||||
make gen-web
|
|
||||||
cd web
|
|
||||||
cd api && npm i && cd ..
|
|
||||||
npm i
|
|
||||||
npm run build
|
|
||||||
- task: CmdLine@2
|
|
||||||
displayName: Run full test suite
|
|
||||||
inputs:
|
|
||||||
script: |
|
|
||||||
pipenv run python -m scripts.generate_ci_config
|
|
||||||
pipenv run make test-e2e
|
|
||||||
- task: CmdLine@2
|
|
||||||
condition: always()
|
|
||||||
displayName: Cleanup
|
|
||||||
inputs:
|
|
||||||
script: |
|
|
||||||
docker stop $(docker ps -aq)
|
|
||||||
docker container prune -f
|
|
||||||
- task: CmdLine@2
|
|
||||||
displayName: Prepare unittests and coverage for upload
|
|
||||||
inputs:
|
|
||||||
script: |
|
|
||||||
mkdir output-e2e-firefox
|
|
||||||
mv unittest.xml output-e2e-firefox/unittest.xml
|
|
||||||
mv .coverage output-e2e-firefox/coverage
|
|
||||||
- task: PublishPipelineArtifact@1
|
|
||||||
condition: failed()
|
|
||||||
displayName: Upload screenshots if selenium tests fail
|
|
||||||
inputs:
|
|
||||||
targetPath: 'selenium_screenshots/'
|
|
||||||
artifact: 'firefox selenium screenshots'
|
|
||||||
publishLocation: 'pipeline'
|
|
||||||
- task: PublishPipelineArtifact@1
|
|
||||||
inputs:
|
|
||||||
targetPath: 'output-e2e-firefox/'
|
|
||||||
artifact: 'coverage-e2e-firefox'
|
|
||||||
publishLocation: 'pipeline'
|
publishLocation: 'pipeline'
|
||||||
- stage: test_combine
|
- stage: test_combine
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -425,13 +355,8 @@ stages:
|
||||||
- task: DownloadPipelineArtifact@2
|
- task: DownloadPipelineArtifact@2
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: 'current'
|
||||||
artifactName: 'coverage-e2e-firefox'
|
artifactName: 'coverage-e2e'
|
||||||
path: "coverage-e2e-firefox/"
|
path: "coverage-e2e/"
|
||||||
- task: DownloadPipelineArtifact@2
|
|
||||||
inputs:
|
|
||||||
buildType: 'current'
|
|
||||||
artifactName: 'coverage-e2e-chrome'
|
|
||||||
path: "coverage-e2e-chrome/"
|
|
||||||
- task: DownloadPipelineArtifact@2
|
- task: DownloadPipelineArtifact@2
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: 'current'
|
||||||
|
@ -452,7 +377,7 @@ stages:
|
||||||
sudo apt install -y libxmlsec1-dev pkg-config
|
sudo apt install -y libxmlsec1-dev pkg-config
|
||||||
sudo pip install -U wheel pipenv
|
sudo pip install -U wheel pipenv
|
||||||
pipenv install --dev
|
pipenv install --dev
|
||||||
pipenv run coverage combine coverage-e2e-chrome/coverage coverage-e2e-firefox/coverage coverage-unittest/coverage coverage-integration/coverage
|
pipenv run coverage combine coverage-e2e/coverage coverage-unittest/coverage coverage-integration/coverage
|
||||||
pipenv run coverage xml
|
pipenv run coverage xml
|
||||||
pipenv run coverage html
|
pipenv run coverage html
|
||||||
- task: PublishCodeCoverageResults@1
|
- task: PublishCodeCoverageResults@1
|
||||||
|
@ -465,8 +390,7 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
testResultsFormat: 'JUnit'
|
testResultsFormat: 'JUnit'
|
||||||
testResultsFiles: |
|
testResultsFiles: |
|
||||||
coverage-e2e-chrome/unittest.xml
|
coverage-e2e/unittest.xml
|
||||||
coverage-e2e-firefox/unittest.xml
|
|
||||||
coverage-integration/unittest.xml
|
coverage-integration/unittest.xml
|
||||||
coverage-unittest/unittest.xml
|
coverage-unittest/unittest.xml
|
||||||
mergeTestResults: true
|
mergeTestResults: true
|
||||||
|
@ -479,8 +403,7 @@ stages:
|
||||||
npm install -g @zeus-ci/cli
|
npm install -g @zeus-ci/cli
|
||||||
npx zeus job update -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -r $BUILD_SOURCEVERSION
|
npx zeus job update -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -r $BUILD_SOURCEVERSION
|
||||||
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-cobertura+xml" coverage.xml
|
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-cobertura+xml" coverage.xml
|
||||||
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-e2e-firefox/unittest.xml
|
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-e2e/unittest.xml
|
||||||
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-e2e-chrome/unittest.xml
|
|
||||||
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-integration/unittest.xml
|
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-integration/unittest.xml
|
||||||
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-unittest/unittest.xml
|
npx zeus upload -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -t "application/x-junit+xml" coverage-unittest/unittest.xml
|
||||||
npx zeus job update --status=passed -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -r $BUILD_SOURCEVERSION
|
npx zeus job update --status=passed -b $BUILD_BUILDID -j $BUILD_BUILDNUMBER -r $BUILD_SOURCEVERSION
|
||||||
|
|
|
@ -6,8 +6,3 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /dev/shm:/dev/shm
|
- /dev/shm:/dev/shm
|
||||||
network_mode: host
|
network_mode: host
|
||||||
firefox:
|
|
||||||
image: selenium/standalone-firefox:3.141
|
|
||||||
volumes:
|
|
||||||
- /dev/shm:/dev/shm
|
|
||||||
network_mode: host
|
|
||||||
|
|
Reference in New Issue