Skip to content

Commit

Permalink
Comment out missed queue references in pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
NickPhura committed Mar 19, 2024
1 parent bb6cf48 commit 6af45c9
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 119 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/cleanClosedPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ jobs:
DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
# Clean the queue deployment artifacts
- name: Clean Queue Deployment
working-directory: "./api/.pipeline/"
run: |
npm ci
DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev
# # Clean the queue deployment artifacts
# - name: Clean Queue Deployment
# working-directory: "./api/.pipeline/"
# run: |
# npm ci
# DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
# DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev

# Clean the reamaining build/deployment artifacts
- name: Clean remaining Artifacts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -731,12 +731,12 @@ jobs:
- buildDatabase
- buildDatabaseSetup
- buildAPI
- buildQueue
# - buildQueue
- deployAPP
- deployDatabase
- deployDatabaseSetup
- deployAPI
- deployQueue
# - deployQueue
steps:
- name: Log result
run: |
Expand All @@ -747,12 +747,12 @@ jobs:
echo needs.buildDatabase.result: ${{ needs.buildDatabase.result }}
echo needs.buildDatabaseSetup.result: ${{ needs.buildDatabaseSetup.result }}
echo needs.buildAPI.result: ${{ needs.buildAPI.result }}
echo needs.buildQueue.result: ${{ needs.buildQueue.result }}
# echo needs.buildQueue.result: ${{ needs.buildQueue.result }}
echo needs.deployAPP.result: ${{ needs.deployAPP.result }}
echo needs.deployDatabase.result: ${{ needs.deployDatabase.result }}
echo needs.deployDatabaseSetup.result: ${{ needs.deployDatabaseSetup.result }}
echo needs.deployAPI.result: ${{ needs.deployAPI.result }}
echo needs.deployQueue.result: ${{ needs.deployQueue.result }}
# echo needs.deployQueue.result: ${{ needs.deployQueue.result }}
- name: Report success
if: |
Expand Down
216 changes: 108 additions & 108 deletions .github/workflows/deployStatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,55 +285,55 @@ jobs:
run: |
DEBUG=* npm run build -- --pr=$PR_NUMBER --branch=$BRANCH --type=static
# Build the Queue image
buildQueue:
name: Build Queue Image
runs-on: ubuntu-latest
timeout-minutes: 20
if: ${{ github.event.pull_request.merged == true }}
env:
PR_NUMBER: ${{ github.event.number }}
BRANCH: ${{ github.base_ref }}
needs:
- checkoutRepo
steps:
# Install Node - for `node` and `npm` commands
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 14

# Load repo from cache
- name: Cache repo
uses: actions/cache@v3
id: cache-repo
env:
cache-name: cache-repo
with:
path: ${{ github.workspace }}/*
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}

# Checkout the branch if not restored via cache
- name: Checkout Target Branch
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v3

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
- name: Log in to OpenShift
run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

# Install api pipeline node modules
- name: Install api pipeline node modules
working-directory: "api/.pipeline/"
run: npm ci

# Build the queue image
- name: Build Queue Image
working-directory: "./api/.pipeline/"
run: |
DEBUG=* npm run queue:build -- --pr=$PR_NUMBER --branch=$BRANCH --type=static
# # Build the Queue image
# buildQueue:
# name: Build Queue Image
# runs-on: ubuntu-latest
# timeout-minutes: 20
# if: ${{ github.event.pull_request.merged == true }}
# env:
# PR_NUMBER: ${{ github.event.number }}
# BRANCH: ${{ github.base_ref }}
# needs:
# - checkoutRepo
# steps:
# # Install Node - for `node` and `npm` commands
# - name: Setup Node.js
# uses: actions/setup-node@v3
# with:
# node-version: 14

# # Load repo from cache
# - name: Cache repo
# uses: actions/cache@v3
# id: cache-repo
# env:
# cache-name: cache-repo
# with:
# path: ${{ github.workspace }}/*
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}

# # Checkout the branch if not restored via cache
# - name: Checkout Target Branch
# if: steps.cache-repo.outputs.cache-hit != 'true'
# uses: actions/checkout@v3

# # Log in to OpenShift.
# # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
# - name: Log in to OpenShift
# run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

# # Install api pipeline node modules
# - name: Install api pipeline node modules
# working-directory: "api/.pipeline/"
# run: npm ci

# # Build the queue image
# - name: Build Queue Image
# working-directory: "./api/.pipeline/"
# run: |
# DEBUG=* npm run queue:build -- --pr=$PR_NUMBER --branch=$BRANCH --type=static

# Deploy APP image
deployAPP:
Expand Down Expand Up @@ -541,58 +541,58 @@ jobs:
run: |
DEBUG=* npm run deploy -- --pr=$PR_NUMBER --env=$BRANCH --branch=$BRANCH --type=static
# Deploy Queue image
deployQueue:
name: Deploy Queue Image
runs-on: ubuntu-latest
timeout-minutes: 20
if: ${{ github.event.pull_request.merged == true }}
env:
PR_NUMBER: ${{ github.event.number }}
BRANCH: ${{ github.base_ref }}
needs:
- scaleDownPods
- buildQueue
- deployDatabase
steps:
# Install Node - for `node` and `npm` commands
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 14

# Load repo from cache
- name: Cache repo
uses: actions/cache@v3
id: cache-repo
env:
cache-name: cache-repo
with:
path: ${{ github.workspace }}/*
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}

# Checkout the branch if not restored via cache
- name: Checkout Target Branch
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v3

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
- name: Log in to OpenShift
run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

# Install api pipeline node modules
- name: Install api pipeline node modules
working-directory: "api/.pipeline/"
run: npm ci

# Deploy the queue image
- name: Deploy Queue Image
working-directory: "./api/.pipeline/"
run: |
npm ci
DEBUG=* npm run queue:deploy -- --pr=$PR_NUMBER --env=$BRANCH --branch=$BRANCH --type=static
# # Deploy Queue image
# deployQueue:
# name: Deploy Queue Image
# runs-on: ubuntu-latest
# timeout-minutes: 20
# if: ${{ github.event.pull_request.merged == true }}
# env:
# PR_NUMBER: ${{ github.event.number }}
# BRANCH: ${{ github.base_ref }}
# needs:
# - scaleDownPods
# - buildQueue
# - deployDatabase
# steps:
# # Install Node - for `node` and `npm` commands
# - name: Setup Node.js
# uses: actions/setup-node@v3
# with:
# node-version: 14

# # Load repo from cache
# - name: Cache repo
# uses: actions/cache@v3
# id: cache-repo
# env:
# cache-name: cache-repo
# with:
# path: ${{ github.workspace }}/*
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}

# # Checkout the branch if not restored via cache
# - name: Checkout Target Branch
# if: steps.cache-repo.outputs.cache-hit != 'true'
# uses: actions/checkout@v3

# # Log in to OpenShift.
# # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
# - name: Log in to OpenShift
# run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

# # Install api pipeline node modules
# - name: Install api pipeline node modules
# working-directory: "api/.pipeline/"
# run: npm ci

# # Deploy the queue image
# - name: Deploy Queue Image
# working-directory: "./api/.pipeline/"
# run: |
# npm ci
# DEBUG=* npm run queue:deploy -- --pr=$PR_NUMBER --env=$BRANCH --branch=$BRANCH --type=static

# Clean build/deployment artifacts
clean:
Expand Down Expand Up @@ -660,13 +660,13 @@ jobs:
DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
# Clean the queue deployment artifacts
- name: Clean Queue Deployment
working-directory: "./api/.pipeline/"
run: |
npm ci
DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev
# # Clean the queue deployment artifacts
# - name: Clean Queue Deployment
# working-directory: "./api/.pipeline/"
# run: |
# npm ci
# DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
# DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev

# Clean the reamaining build/deployment artifacts
- name: Clean remaining Artifacts
Expand Down

0 comments on commit 6af45c9

Please sign in to comment.