diff --git a/theforeman.org/pipelines/lib/stable/smart-proxy.groovy b/theforeman.org/pipelines/lib/stable/smart-proxy.groovy deleted file mode 100644 index 9ee43b52..00000000 --- a/theforeman.org/pipelines/lib/stable/smart-proxy.groovy +++ /dev/null @@ -1,13 +0,0 @@ -properties([ - parameters([ - gitParameter(branch: '', - defaultValue: git_branch, - description: '', - name: 'BRANCH', - quickFilterEnabled: false, - selectedValue: 'NONE', - sortMode: 'NONE', - tagFilter: '*', - type: 'PT_BRANCH') - ]) -]) diff --git a/theforeman.org/pipelines/test/smart-proxy.groovy b/theforeman.org/pipelines/test/smart-proxy.groovy index 6ffc1133..c391a0d6 100644 --- a/theforeman.org/pipelines/test/smart-proxy.groovy +++ b/theforeman.org/pipelines/test/smart-proxy.groovy @@ -1,11 +1,3 @@ -def git_checkout = { - if (env.ghprbPullId) { - ghprb_git_checkout() - } else { - git branch: "${params.BRANCH}", url: 'https://github.com/theforeman/smart-proxy' - } -} - pipeline { agent none options { @@ -28,9 +20,7 @@ pipeline { stages { stage('Setup Git Repos') { steps { - script { - git_checkout() - } + git branch: git_branch, url: 'https://github.com/theforeman/smart-proxy' } } stage('Install dependencies') { diff --git a/theforeman.org/yaml/jobs/pipeline/foreman-stable-pipelines.yaml b/theforeman.org/yaml/jobs/pipeline/foreman-stable-pipelines.yaml index f6f3387f..b486beaf 100644 --- a/theforeman.org/yaml/jobs/pipeline/foreman-stable-pipelines.yaml +++ b/theforeman.org/yaml/jobs/pipeline/foreman-stable-pipelines.yaml @@ -8,7 +8,6 @@ dsl: !include-raw-verbatim: - 'pipelines/vars/foreman/{version}.groovy' - - 'pipelines/lib/stable/smart-proxy.groovy{empty}' - 'pipelines/test/smart-proxy.groovy{empty}' - 'pipelines/lib/rbenv.groovy{empty}' diff --git a/theforeman.org/yaml/jobs/tests/smart-proxy-pr-test.yaml b/theforeman.org/yaml/jobs/tests/smart-proxy-pr-test.yaml deleted file mode 100644 index 0cbc20a4..00000000 --- a/theforeman.org/yaml/jobs/tests/smart-proxy-pr-test.yaml +++ /dev/null @@ -1,16 +0,0 @@ -- job: - name: smart-proxy-pr-test - project-type: pipeline - sandbox: true - properties: - - github: - url: https://github.com/theforeman/smart-proxy - - tfm-pull-request-build-discarder - triggers: - - github_pr: - context: 'smart-proxy' - dsl: - !include-raw-verbatim: - - pipelines/lib/git.groovy - - pipelines/test/smart-proxy.groovy - - pipelines/lib/rbenv.groovy diff --git a/theforeman.org/yaml/triggers/github_pr.yaml b/theforeman.org/yaml/triggers/github_pr.yaml index f73fa576..543d7156 100644 --- a/theforeman.org/yaml/triggers/github_pr.yaml +++ b/theforeman.org/yaml/triggers/github_pr.yaml @@ -2,7 +2,6 @@ name: ghprb_defaults org-list: - theforeman - - katello white-list: - 'github-actions[bot]' - 'github-actions' @@ -17,12 +16,6 @@ status-add-test-results: true cancel-builds-on-update: true -- trigger: - name: github_pr - triggers: - - github-pull-request: - <<: *ghprb_defaults - - trigger: name: github_pr_deb triggers: