summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2015-07-15 09:29:07 -0400
committerBill Peck <bpeck@redhat.com>2015-07-15 09:29:07 -0400
commit775c3f1f428b45756894b63aa51b49733eb0d026 (patch)
tree63da6053cb4cebd68f9432c2f5427920a6b48e27
parentd40cae00439b1bbfc7046a510617d81ebb75068e (diff)
downloadtests-775c3f1f428b45756894b63aa51b49733eb0d026.tar.gz
tests-775c3f1f428b45756894b63aa51b49733eb0d026.tar.xz
tests-775c3f1f428b45756894b63aa51b49733eb0d026.zip
remove restraint from ks_meta for testing
-rw-r--r--restraint/config/eso-rhel-6.json1
-rw-r--r--restraint/config/kgtt-restraint.yaml11
2 files changed, 3 insertions, 9 deletions
diff --git a/restraint/config/eso-rhel-6.json b/restraint/config/eso-rhel-6.json
index 1177c84..280a50f 100644
--- a/restraint/config/eso-rhel-6.json
+++ b/restraint/config/eso-rhel-6.json
@@ -13,7 +13,6 @@
"variant": "Server",
"hostrequire": [],
"ks_meta": {
- "restraint": "http://file.bos.redhat.com/~bpeck/restraint/el6eso/"
},
"bkr_data": {
"role": "Standalone",
diff --git a/restraint/config/kgtt-restraint.yaml b/restraint/config/kgtt-restraint.yaml
index 19c4e70..e17637b 100644
--- a/restraint/config/kgtt-restraint.yaml
+++ b/restraint/config/kgtt-restraint.yaml
@@ -9,7 +9,7 @@
url: 'http://git.engineering.redhat.com/git/users/bpeck/ci-ops-central.git'
#url: 'https://code.engineering.redhat.com/gerrit/ci-ops-central'
branches:
- - origin/testing
+ - origin/restraint
basedir: ci-ops-central
- git:
url: 'https://code.engineering.redhat.com/gerrit/ci-ops-projex'
@@ -39,7 +39,7 @@
url: 'http://git.engineering.redhat.com/git/users/bpeck/ci-ops-central.git'
#url: 'https://code.engineering.redhat.com/gerrit/ci-ops-central'
branches:
- - origin/master
+ - origin/restraint
basedir: ci-ops-central
- git:
url: 'http://git.app.eng.bos.redhat.com/git/ci-ops-projex.git'
@@ -127,7 +127,7 @@
node: master
triggers:
- ci-trigger:
- jms-selector: 'CI_TYPE = ''brew-taskstatechange'' AND method = ''build'' AND package = ''restraint'''
+ jms-selector: 'CI_TYPE = ''brew-taskstatechange'' AND method = ''build'' AND package = ''{project}'''
builders:
- shell: |
#!/bin/bash
@@ -229,11 +229,6 @@
default: ci-ops-projex/config/keys/ci-ops-central
description: |
Private SSH key to use for authentication
- - string:
- name: RESTRAINTREPO
- default: http://bpeck.fedorapeople.org/restraint/el5.repo
- description: |
- where do we install restraint from...
builders:
- copyartifact:
project: '{project}-2-provision'