Skip to content

Commit

Permalink
remove oc_install playbook; use oc provided by tool-container (#30)
Browse files Browse the repository at this point in the history
Signed-off-by: Valeriy Svydenko <[email protected]>
  • Loading branch information
svor committed Jun 4, 2024
1 parent 23f653a commit 93cca80
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ driver:
ansible_connection_options:
connection: local
platforms:
- name: molecule-ubi8-init-1
image: registry.access.redhat.com/ubi8/ubi-init@sha256:75cb1eb60b9636f8daa584c231db552c1de94006778e7224643804a696f04fad
- name: molecule-ubi8-python-1
image: registry.access.redhat.com/ubi8/python-39@sha256:301fec66443f80c3cc507ccaf72319052db5a1dc56deb55c8f169011d4bbaacb
workingDir: '/tmp'
provisioner:
name: ansible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
state: directory
mode: 0770

- name: Download oc binary from OCP downloads svc endpoint
ansible.builtin.get_url:
url: http://downloads.openshift-console.svc.cluster.local/amd64/linux/oc
dest: "{{ molecule_user_home_dir }}/bin/oc"
mode: '0770'

- name: Add another bin dir to system-wide $PATH.
ansible.builtin.lineinfile:
path: "{{ molecule_user_home_dir }}/.bashrc"
Expand Down
14 changes: 1 addition & 13 deletions devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
components:
- name: tooling-container
container:
image: ghcr.io/ansible/ansible-workspace-env-reference@sha256:f02448b3b8423cfedf2773bb2dc8c21e2bf3a00c3df6e501916af2c5467a93f2
image: ghcr.io/ansible/ansible-workspace-env-reference@sha256:03d7f0fe6caaae62ff2266906b63d67ebd9cf6e4a056c7c0a0c1320e6cfbebce
memoryRequest: 256M
memoryLimit: 6Gi
cpuRequest: 250m
Expand All @@ -15,15 +15,6 @@ components:
value: '~/.ansible/collections:/usr/share/ansible/collections:/projects/ansible-devspaces-demo/collections'
commands:

- id: oc-install
exec:
commandLine: '/usr/local/bin/ansible-playbook ${PROJECT_SOURCE}/playbooks/install_oc.yml'
workingDir: ${PROJECT_SOURCE}
group:
kind: build
isDefault: true
component: tooling-container

- id: molecule-create
exec:
label: "1.Molecule: start a test pod for the automation"
Expand Down Expand Up @@ -95,6 +86,3 @@ commands:
ansible-navigator --ee false
workingDir: ${PROJECTS_ROOT}/ansible-devspaces-demo
component: tooling-container
events:
postStart:
- "oc-install"
39 changes: 0 additions & 39 deletions playbooks/install_oc.yml

This file was deleted.

0 comments on commit 93cca80

Please sign in to comment.