Skip to content

Commit

Permalink
chore(ci): ubuntu-24.04 runner oc changes (#1648)
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Sep 27, 2024
1 parent e6bba8e commit b78cd06
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
REPO: ${{ github.event.repository.name }}
runs-on: ubuntu-latest
steps:
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: Point DEMO URL to Existing Service
run: |
# Set Up Routing
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/job-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- run: |
# Login to OpenShift
oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
Expand Down
24 changes: 6 additions & 18 deletions .github/workflows/job-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ jobs:
name: Sync (TEST)
runs-on: ubuntu-latest
steps:
- name: Override OpenShift version
env:
OC: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.13/openshift-client-linux.tar.gz
run: |
# Download and extract with retry, continuing on error
(wget ${{ env.OC }} -qcO - | tar -xzvf - oc)|| !! || true
oc version
working-directory: /usr/local/bin/

- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: ETL (TEST)
run: ./sync/oc_run.sh test ${{ secrets.oc_token }}

Expand All @@ -32,15 +26,9 @@ jobs:
name: Sync (PROD)
runs-on: ubuntu-latest
steps:
- name: Override OpenShift version
env:
OC: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.13/openshift-client-linux.tar.gz
run: |
# Download and extract with retry, continuing on error
(wget ${{ env.OC }} -qcO - | tar -xzvf - oc)|| !! || true
oc version
working-directory: /usr/local/bin/

- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: ETL (PROD)
run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}
1 change: 0 additions & 1 deletion sync/junk.out

This file was deleted.

0 comments on commit b78cd06

Please sign in to comment.