diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 394bea6d4..246d4322f 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -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 diff --git a/.github/workflows/job-nightly.yml b/.github/workflows/job-nightly.yml index 5adb83c61..8b3393f48 100644 --- a/.github/workflows/job-nightly.yml +++ b/.github/workflows/job-nightly.yml @@ -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 }} diff --git a/.github/workflows/job-sync.yml b/.github/workflows/job-sync.yml index 6e427b5ea..5a35d448e 100644 --- a/.github/workflows/job-sync.yml +++ b/.github/workflows/job-sync.yml @@ -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 }} @@ -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 }} diff --git a/sync/junk.out b/sync/junk.out deleted file mode 100644 index a94193101..000000000 --- a/sync/junk.out +++ /dev/null @@ -1 +0,0 @@ -junk