Skip to content

Commit

Permalink
Merge branch 'master' into use-tf-redis-code-cov
Browse files Browse the repository at this point in the history
  • Loading branch information
srbarrios authored Oct 15, 2024
2 parents 49e9109 + d42c736 commit ec0c45e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 500 deletions.
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/common/pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def run(params) {
}
// The 2obs jobs are releng, not dev
prefix = prefix.replaceAll("-dev", "-releng")
def request = httpRequest "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json"
def request = httpRequest ignoreSslErrors: true, url: "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json"
def requestJson = readJSON text: request.getContent()
product_commit = "${requestJson.actions.lastBuiltRevision.SHA1}"
product_commit = product_commit.substring(product_commit.indexOf('[') + 1, product_commit.indexOf(']'));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
node('sumaform-cucumber') {
properties([
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
8 changes: 1 addition & 7 deletions jenkins_pipelines/manager_prs/tests_files/rubocop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@ rubocop_file="testsuite/.rubocop.yml"
if [[ -f "$rubocop_file" ]]; then
# Extract the Ruby version from the file
ruby_version=$(grep "TargetRubyVersion:" "$rubocop_file" | awk '{print $2}')
# Temporary skip the check for Ruby 3.3
if [[ "$ruby_version" == "3.3" ]]; then
echo "Skipping Rubocop for Ruby 3.3, until sumadockers support it."
exit 0
fi
if [[ -n "$ruby_version" ]]; then
rubocop.ruby"$ruby_version" -v
cd testsuite
rubocop.ruby"$ruby_version" features/*
docker run --rm --volume "$PWD:/app" docker.io/srbarrios/rubocop:ruby-$ruby_version
else
echo "No TargetRubyVersion found in $rubocop_file."
fi
Expand Down
16 changes: 13 additions & 3 deletions jenkins_pipelines/uyuni_prs/tests_files/rubocop.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
#! /bin/bash

echo "running rubocop on step files"
rubocop.ruby2.5 -v
cd testsuite
rubocop.ruby2.5 features/*
rubocop_file="testsuite/.rubocop.yml"
if [[ -f "$rubocop_file" ]]; then
# Extract the Ruby version from the file
ruby_version=$(grep "TargetRubyVersion:" "$rubocop_file" | awk '{print $2}')
if [[ -n "$ruby_version" ]]; then
cd testsuite
docker run --rm --volume "$PWD:/app" docker.io/srbarrios/rubocop:ruby-$ruby_version
else
echo "No TargetRubyVersion found in $rubocop_file."
fi
else
echo "File $rubocop_file does not exist."
fi
Loading

0 comments on commit ec0c45e

Please sign in to comment.