diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19335e885..213d52a87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,8 @@ stages: paths: - journal-log.gpg - ci-artifacts + - "*.repo" + - COMPOSER_NVR when: always .terraform: @@ -57,10 +59,6 @@ RPM: after_script: - schutzbot/update_github_status.sh update - schutzbot/save_journal.sh - artifacts: - paths: - - journal-log.gpg - when: always parallel: matrix: - RUNNER: @@ -86,9 +84,6 @@ Build -tests RPM for RHEL: after_script: - schutzbot/update_github_status.sh update - schutzbot/save_journal.sh - artifacts: - paths: - - journal-log.gpg parallel: matrix: - <<: *RPM_RUNNERS_RHEL @@ -165,11 +160,6 @@ Base: - aws/rhel-9.0-nightly-x86_64 - aws/rhel-9.0-nightly-aarch64 INTERNAL_NETWORK: ["true"] - artifacts: - paths: - - journal-log.gpg - - "*.repo" - when: always Manifests: stage: test @@ -186,11 +176,6 @@ Manifests: - RUNNER: - aws/rhel-9.0-nightly-x86_64 INTERNAL_NETWORK: ["true"] - artifacts: - paths: - - journal-log.gpg - - "*.repo" - when: always Regression: stage: test @@ -219,12 +204,6 @@ Regression: - aws/rhel-9.0-nightly-x86_64 - aws/rhel-9.0-nightly-aarch64 INTERNAL_NETWORK: ["true"] - artifacts: - paths: - - journal-log.gpg - - "*.repo" - when: always - Image Tests: stage: test @@ -244,12 +223,6 @@ Image Tests: - aws/rhel-9.0-nightly-x86_64 - aws/rhel-9.0-nightly-aarch64 INTERNAL_NETWORK: ["true"] - artifacts: - paths: - - journal-log.gpg - - "*.repo" - when: always - Test Case Generation: stage: test @@ -264,11 +237,6 @@ Test Case Generation: - RUNNER: - aws/fedora-34-x86_64 INTERNAL_NETWORK: ["true"] - artifacts: - paths: - - journal-log.gpg - - "*.repo" - when: always OSTree: stage: test diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh index 5fc98d544..5fa89c3cc 100755 --- a/schutzbot/deploy.sh +++ b/schutzbot/deploy.sh @@ -126,6 +126,9 @@ retry sudo dnf -y upgrade selinux-policy # Note: installing only -tests to catch missing dependencies retry sudo dnf -y install "${PROJECT}-tests" +# Save osbuild-composer NVR to a file to be used as CI artifact +rpm -q osbuild-composer > COMPOSER_NVR + if [ "${NIGHTLY:=false}" == "true" ]; then # check if we've installed the osbuild-composer RPM from the nightly tree # under test or happen to install a newer version from one of the S3 repositories diff --git a/schutzbot/slack_notification.sh b/schutzbot/slack_notification.sh index 9e50600fa..2fc9a71fc 100755 --- a/schutzbot/slack_notification.sh +++ b/schutzbot/slack_notification.sh @@ -3,7 +3,8 @@ set -eux COMPOSE_ID=$(cat COMPOSE_ID) -MESSAGE="\"Nightly pipeline execution on *$COMPOSE_ID* finished with status *$1* $2 \n QE: @atodorov, @jrusz, @jabia \n Link to results: $CI_PIPELINE_URL \"" +COMPOSER_NVR=$(cat COMPOSER_NVR) +MESSAGE="\"Nightly pipeline execution on *$COMPOSE_ID* with *$COMPOSER_NVR* finished with status *$1* $2 \n QE: @atodorov, @jrusz, @jabia \n Link to results: $CI_PIPELINE_URL \"" curl \ -X POST \