diff --git a/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh b/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh deleted file mode 100644 index 635b6cd4..00000000 --- a/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -ex - -echo "Setting up RVM environment." -set +x -# RVM Ruby environment -. /etc/profile.d/rvm.sh -# Use a gemset unique to each executor to enable parallel builds -gemset=$(echo ${JOB_NAME} | cut -d/ -f1)-${EXECUTOR_NUMBER} -rvm use ruby-${ruby}@${gemset} --create -rvm gemset empty --force -set -x - -if [ "${ruby}" = '2.7' ] -then - gem install bundler -v 2.4.22 --no-document -else - gem install bundler --no-document -fi - -# Link hammer_cli from github -if [ "$ghprbTargetBranch" = "master" ]; then - echo 'gem "hammer_cli", :github => "theforeman/hammer-cli"' > Gemfile.local -fi - -bundle install --without=development --jobs=5 --retry=5 -bundle exec rake ci:setup:minitest test TESTOPTS="-v" diff --git a/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh b/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh deleted file mode 100644 index 1e67ed4b..00000000 --- a/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -ex - -echo "Setting up RVM environment." -set +x -# RVM Ruby environment -. /etc/profile.d/rvm.sh -# Use a gemset unique to each executor to enable parallel builds -gemset=$(echo ${JOB_NAME} | cut -d/ -f1)-${EXECUTOR_NUMBER} -rvm use ruby-${ruby}@${gemset} --create -rvm gemset empty --force -set -x - -if [ "${ruby}" = '2.7' ] -then - gem install bundler -v 2.4.22 --no-document -else - gem install bundler --no-document -fi - -bundle install --without development --jobs=5 --retry=5 -bundle exec rake ci:setup:minitest test TESTOPTS="-v" diff --git a/theforeman.org/yaml/jobs/test_hammer_cli_foreman_pull_request.yaml b/theforeman.org/yaml/jobs/test_hammer_cli_foreman_pull_request.yaml deleted file mode 100644 index 692e349c..00000000 --- a/theforeman.org/yaml/jobs/test_hammer_cli_foreman_pull_request.yaml +++ /dev/null @@ -1,35 +0,0 @@ -- job: - name: test_hammer_cli_foreman_pull_request - description: | - Test a Hammer CLI (Foreman) pull request under each Ruby version. - project-type: matrix - concurrent: true - properties: - - github: - url: https://github.com/theforeman/hammer-cli-foreman - - tfm-pull-request-build-discarder - parameters: - - pr_parameters - scm: - - git: - url: https://github.com/theforeman/hammer-cli-foreman - wipe-workspace: true - branches: - - '${ghprbActualCommit}' - refspec: '+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*' - triggers: - - github_pr: - context: hammer - axes: - - axis: - type: user-defined - name: ruby - values: - - 2.7 - builders: - - shell: !include-raw: scripts/test/test_hammer_cli_foreman_pull_request.sh - publishers: - - gemset_cleanup - - junit: - results: 'test/reports/*.xml' - health-scale-factor: 1.0 diff --git a/theforeman.org/yaml/jobs/test_hammer_cli_pull_request.yaml b/theforeman.org/yaml/jobs/test_hammer_cli_pull_request.yaml deleted file mode 100644 index eb0feeb7..00000000 --- a/theforeman.org/yaml/jobs/test_hammer_cli_pull_request.yaml +++ /dev/null @@ -1,36 +0,0 @@ -- job: - name: test_hammer_cli_pull_request - description: | - Test a Hammer CLI pull request under each Ruby version. - project-type: matrix - concurrent: true - properties: - - github: - url: https://github.com/theforeman/hammer-cli - - tfm-pull-request-build-discarder - parameters: - - pr_parameters - scm: - - git: - url: https://github.com/theforeman/hammer-cli - wipe-workspace: true - branches: - - '${ghprbActualCommit}' - refspec: '+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*' - triggers: - - github_pr: - context: hammer - axes: - - axis: - type: user-defined - name: ruby - values: - - 2.7 - builders: - - shell: !include-raw: scripts/test/test_hammer_cli_pull_request.sh - publishers: - - gemset_cleanup - - junit: - results: 'test/reports/*.xml' - health-scale-factor: 1.0 -