Skip to content

Commit 9059ef9

Browse files
Remove OLM/bundle mode from the CI
This change is the first step to remove the support for OLM/bundle mode deployment. Change-Id: I6c0404bdc9cb4e4a31669fc42bbe3f5833822bf5
1 parent 43fd4d1 commit 9059ef9

28 files changed

Lines changed: 114 additions & 660 deletions

File tree

playbooks/main.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.

playbooks/publish.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

playbooks/run-all-tests.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
- hosts: "{{ hostname | default('controller') }}"
3+
vars:
4+
project_dir: "{% if zuul.project.src_dir is defined %}~/{{ zuul.project.src_dir }}{% else %}..{% endif %}"
5+
roles:
6+
- setup-variables
7+
- setup-env
8+
- sanity-check
9+
- sfconfig-dev-prepare
10+
tasks:
11+
- name: Get iplb ip address
12+
ansible.builtin.command: /usr/local/bin/recognize-iplb-ip-address.sh
13+
register: _iplb_ip
14+
15+
- name: Set fact with iplb ip address
16+
ansible.builtin.set_fact:
17+
iplb_ip_address: "{{ _iplb_ip.stdout }}"
18+
19+
- name: Set hostAliases - edit playbooks/files/ yaml files
20+
ansible.builtin.include_role:
21+
name: create-hostaliases-cr
22+
loop:
23+
- "{{ '~/' + zuul.project.src_dir + '/playbooks' | realpath | default(playbook_dir) }}/files/ext-ze.yaml"
24+
- "{{ '~/' + zuul.project.src_dir + '/playbooks' | realpath | default(playbook_dir) }}/files/sf.yaml"
25+
loop_control:
26+
loop_var: yaml_file
27+
28+
- name: Run tests
29+
ansible.builtin.include_role:
30+
name: run-tests

playbooks/run-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
- hosts: "{{ hostname | default('controller') }}"
33
vars:
4-
mode: standalone
54
project_dir: "{% if zuul.project.src_dir is defined %}~/{{ zuul.project.src_dir }}{% else %}..{% endif %}"
65
pre_tasks:
76
- name: Install test dependencies

playbooks/upgrade.yaml

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
22
- hosts: "{{ hostname | default('controller') }}"
3+
vars:
4+
project_dir: "{% if zuul.project.src_dir is defined %}~/{{ zuul.project.src_dir }}{% else %}..{% endif %}"
35
roles:
46
- setup-variables
57
- setup-env
@@ -24,37 +26,18 @@
2426
loop_control:
2527
loop_var: yaml_file
2628

27-
- name: Build operator assets
28-
ansible.builtin.include_role:
29-
name: build-operator-assets
30-
vars:
31-
build_bundle: false
32-
33-
- name: Clean installation cli
34-
ansible.builtin.include_role:
35-
name: clean-installations-cli
36-
37-
- name: Install operator
38-
ansible.builtin.include_role:
39-
name: install-operator
40-
vars:
41-
ci_bundle_img: quay.io/software-factory/sf-operator-bundle:latest
29+
- name: Deploy last stable version
30+
command: ./hack/deploy-version.sh "{{ sf_operator_stable_version }}"
31+
args:
32+
chdir: "{{ zuul.project.src_dir }}"
4233

43-
- name: Apply custom resources
34+
- name: Deploy current version
4435
ansible.builtin.include_role:
45-
name: apply-custom-resources
46-
47-
- name: Build operator assets
48-
ansible.builtin.include_role:
49-
name: build-operator-assets
36+
name: run-operator-standalone
5037
vars:
51-
build_bundle: true
52-
ci_bundle_img: localhost:5000/sf-operator-bundle:latest
38+
glue: false
39+
cr_path: playbooks/files/sf-minimal.yaml
5340

5441
- name: Upgrade operator and run tests
5542
ansible.builtin.include_role:
56-
name: "{{ item }}"
57-
loop:
58-
- upgrade-operator
59-
- run-tests
60-
- run-upgrade-validation-tests
43+
name: run-tests

roles/apply-custom-resources/defaults/main.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

roles/apply-custom-resources/tasks/main.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

roles/build-operator-assets/defaults/main.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

roles/build-operator-assets/tasks/main.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

roles/check-operator-version/defaults/main.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)