Workflow cleanup

This commit is contained in:
Chris Roberts 2022-11-04 13:17:28 -07:00
parent 989d418e40
commit 34a1b1de5b
2 changed files with 5 additions and 20 deletions

View File

@ -27,19 +27,7 @@ jobs:
run: ./.ci/release.sh run: ./.ci/release.sh
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
env: env:
ASSETS_LONGTERM_PREFIX: elt
ASSETS_PRIVATE_BUCKET: est
ASSETS_PRIVATE_LONGTERM: ${{ secrets.ASSETS_PRIVATE_LONGTERM }}
ASSETS_PRIVATE_SHORTTERM: ${{ secrets.ASSETS_PRIVATE_SHORTTERM }}
ASSETS_PUBLIC_BUCKET: ${{ secrets.ASSETS_PUBLIC_BUCKET }}
ASSETS_PUBLIC_LONGTERM: ${{ secrets.ASSETS_PUBLIC_LONGTERM }}
ASSETS_PUBLIC_SHORTTERM: ${{ secrets.ASSETS_PUBLIC_SHORTTERM }}
ASSETS_SHORTTERM_PREFIX: ${{ secrets.ASSETS_SHORTTERM_PREFIX }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ASSUME_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
HASHIBOT_EMAIL: ${{ secrets.HASHIBOT_EMAIL }} HASHIBOT_EMAIL: ${{ secrets.HASHIBOT_EMAIL }}
HASHIBOT_TOKEN: ${{ secrets.HASHIBOT_TOKEN }} HASHIBOT_TOKEN: ${{ secrets.HASHIBOT_TOKEN }}
HASHIBOT_USERNAME: ${{ secrets.HASHIBOT_USERNAME }} HASHIBOT_USERNAME: ${{ secrets.HASHIBOT_USERNAME }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
VAGRANT_CI_LOADER_BUCKET: ${{ secrets.VAGRANT_CI_LOADER_BUCKET }}

View File

@ -7,23 +7,20 @@ on:
# Run nightly on weekdays at 05:00 UTC or midnight-ish in US time zones # Run nightly on weekdays at 05:00 UTC or midnight-ish in US time zones
- cron: '0 5 * * 1-5' - cron: '0 5 * * 1-5'
env:
runs-on: ['self-hosted', 'ondemand', 't3.nano']
jobs: jobs:
slack-vars: slack-vars:
if: github.repository == 'hashicorp/vagrant-builders' if: github.repository == 'hashicorp/vagrant-builders'
name: Populate vars name: Populate vars
runs-on: env.runs-on runs-on: ['self-hosted', 'ondemand', 'linux', 'type=t3.nano']
uses: ./.github/workflows/slack-vars.yml uses: ./.github/workflows/slack-vars.yml
packet-vars: packet-vars:
if: github.repository == 'hashicorp/vagrant-builders' if: github.repository == 'hashicorp/vagrant-builders'
name: Populate vars name: Populate vars
runs-on: env.runs-on runs-on: ['self-hosted', 'ondemand', 'linux', 'type=t3.nano']
uses: ./.github/workflows/packet-vars.yml uses: ./.github/workflows/packet-vars.yml
setup-packet: setup-packet:
if: github.repository == 'hashicorp/vagrant-acceptance' if: github.repository == 'hashicorp/vagrant-acceptance'
runs-on: env.runs-on runs-on: ['self-hosted', 'ondemand', 'linux', 'type=t3.nano']
name: Build Packet Instance name: Build Packet Instance
steps: steps:
- name: Code Checkout - name: Code Checkout
@ -39,7 +36,7 @@ jobs:
SLACK_WEBHOOK: ${{ needs.slack-vars.outputs.SLACK_WEBHOOK }} SLACK_WEBHOOK: ${{ needs.slack-vars.outputs.SLACK_WEBHOOK }}
setup-hosts: setup-hosts:
if: github.repository == 'hashicorp/vagrant-acceptance' if: github.repository == 'hashicorp/vagrant-acceptance'
runs-on: env.runs-on runs-on: ['self-hosted', 'ondemand', 'linux', 'type=t3.nano']
name: Vagrant-Spec Start Hosts name: Vagrant-Spec Start Hosts
needs: setup-packet needs: setup-packet
strategy: strategy:
@ -68,7 +65,7 @@ jobs:
spec-tests: spec-tests:
if: github.repository == 'hashicorp/vagrant-acceptance' if: github.repository == 'hashicorp/vagrant-acceptance'
runs-on: env.runs-on runs-on: ['self-hosted', 'ondemand', 'linux', 'type=t3.nano']
name: Vagrant-Spec Tests name: Vagrant-Spec Tests
needs: setup-hosts needs: setup-hosts
strategy: strategy: