Skip to content

Commit

Permalink
test - do not use config/sample for CI test suite
Browse files Browse the repository at this point in the history
This change ensures that only playbooks/files/sf.yaml file is
used for all CI related tasks.

The sample file is now the minimal workingresource file.

Change-Id: Ieb36acbb593834159db02a002215759609b8ee7b
  • Loading branch information
morucci committed Nov 20, 2023
1 parent de92634 commit 01a44a6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 21 deletions.
19 changes: 0 additions & 19 deletions config/samples/sf_v1_softwarefactory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,3 @@ metadata:
name: my-sf
spec:
fqdn: "sfop.me"
config-location:
base-url: "http://gerrit-httpd/"
name: config
zuul-connection-name: gerrit
zuul:
gerritconns:
- name: gerrit
username: zuul
hostname: gerrit-sshd
puburl: "https://gerrit.sfop.me"
executor:
logLevel: DEBUG
logserver:
loopDelay: 5
retentionDays: 30
storage:
size: 2Gi
# NOTE: use "crc-csi-hostpath-provisioner" in CRC deployment
storageClassName: "topolvm-provisioner"
1 change: 0 additions & 1 deletion playbooks/files/sf.yaml

This file was deleted.

25 changes: 25 additions & 0 deletions playbooks/files/sf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
apiVersion: sf.softwarefactory-project.io/v1
kind: SoftwareFactory
metadata:
name: my-sf
spec:
fqdn: "sfop.me"
config-location:
base-url: "http://gerrit-httpd/"
name: config
zuul-connection-name: gerrit
zuul:
gerritconns:
- name: gerrit
username: zuul
hostname: gerrit-sshd
puburl: "https://gerrit.sfop.me"
executor:
logLevel: DEBUG
logserver:
loopDelay: 5
retentionDays: 30
storage:
size: 2Gi
# NOTE: use "crc-csi-hostpath-provisioner" in CRC deployment
storageClassName: "topolvm-provisioner"
2 changes: 1 addition & 1 deletion roles/run-operator-standalone/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
glue: true
cr_path: config/samples/sf_v1_softwarefactory.yaml
cr_path: playbooks/files/sf.yaml

0 comments on commit 01a44a6

Please sign in to comment.