particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: don't run iostats temporarily

Browse source 
CI job execution gets stuck if it fails and waits for timeout because
isostat are running in background preventing the main scrip from
exiting. Removing temporarily until a better solution is found.
This commit is contained in:
Jakub Rusz 2022-01-18 10:36:36 +01:00 • committed by Sanne Raymaekers
parent 18ee1607a1
commit 35fd20c0de
1 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.gitlab-ci.yml
View file

@ -17,7 +17,6 @@ stages:
paths:
- journal-log.gpg
- ci-artifacts
- iostats.json
when: always
.terraform:
@ -45,9 +44,7 @@ RPM:
rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"'
script:
- schutzbot/start_iostats.sh
- sh "schutzbot/mockbuild.sh"
- schutzbot/stop_iostats.sh
interruptible: true
after_script:
- schutzbot/update_github_status.sh update
@ -55,6 +52,7 @@ RPM:
artifacts:
paths:
- journal-log.gpg
when: always
parallel:
matrix:
- RUNNER:
@ -77,9 +75,7 @@ Container:
rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"'
script:
- schutzbot/start_iostats.sh
- sh "schutzbot/containerbuild.sh"
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix:
@ -103,9 +99,7 @@ Prepare-rhel-internal:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/prepare-rhel-internal.sh
- schutzbot/stop_iostats.sh
interruptible: true
artifacts:
paths:
@ -130,10 +124,8 @@ Base:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/base_tests.sh
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix:
@ -186,10 +178,8 @@ Regression:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/regression.sh
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix:
@ -239,10 +229,8 @@ OSTree:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ostree.sh
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix:
@ -258,10 +246,8 @@ New OSTree:
stage: test
extends: OSTree
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ostree-ng.sh
- schutzbot/stop_iostats.sh
parallel:
matrix:
- RUNNER:
@ -273,10 +259,8 @@ OSTree simplified installer:
stage: test
extends: OSTree
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ostree-simplified-installer.sh
- schutzbot/stop_iostats.sh
parallel:
matrix:
- RUNNER:
@ -288,10 +272,8 @@ OSTree raw image:
stage: test
extends: OSTree
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ostree-raw-image.sh
- schutzbot/stop_iostats.sh
parallel:
matrix:
- RUNNER:
@ -316,10 +298,8 @@ Integration:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/${SCRIPT}
- schutzbot/stop_iostats.sh
parallel:
matrix:
- SCRIPT:
@ -354,10 +334,8 @@ API:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/api.sh ${IMAGE_TYPE}
- schutzbot/stop_iostats.sh
parallel:
matrix:
- <<: *API_TESTS
@ -375,10 +353,8 @@ libvirt:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/libvirt.sh
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix:
@ -396,10 +372,8 @@ RHEL 9 on 8:
rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/koji.sh
- schutzbot/stop_iostats.sh
interruptible: true
variables:
RUNNER: aws/rhel-8.5-ga-x86_64
@ -453,10 +427,8 @@ Installer:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
script:
- schutzbot/start_iostats.sh
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/installers.sh
- schutzbot/stop_iostats.sh
interruptible: true
parallel:
matrix: