Unverified Commit cbcd5988 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

ci: unify reset project script (#58829)

We have identical `resetProject` code used in `bench/vercel` and our e2e workflow action -- this updates the `resetProject` script to side-effects free (hence removing the env var) and shared between bench & e2e

Closes NEXT-1731
parent d53ac4ef
...@@ -47,7 +47,7 @@ jobs: ...@@ -47,7 +47,7 @@ jobs:
- run: npm i -g vercel@latest - run: npm i -g vercel@latest
- run: RESET_VC_PROJECT=true node scripts/reset-vercel-project.mjs - run: node scripts/run-project-reset.mjs
name: Reset test project name: Reset test project
- run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && NEXT_JUNIT_TEST_REPORT=true DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} NEXT_TEST_CONTINUE_ON_ERROR=1 xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1" - run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && NEXT_JUNIT_TEST_REPORT=true DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} NEXT_TEST_CONTINUE_ON_ERROR=1 xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
......
import { config } from 'dotenv' import { config } from 'dotenv'
import fetch from 'node-fetch'
import execa from 'execa' import execa from 'execa'
import path from 'path' import path from 'path'
import url from 'url' import url from 'url'
...@@ -8,6 +7,7 @@ import { generatePackageJson } from './generate-package-json.js' ...@@ -8,6 +7,7 @@ import { generatePackageJson } from './generate-package-json.js'
import { Listr } from 'listr2' import { Listr } from 'listr2'
import { forceCrash } from './bench.js' import { forceCrash } from './bench.js'
import { red } from '../../packages/next/dist/lib/picocolors.js' import { red } from '../../packages/next/dist/lib/picocolors.js'
import { resetProject } from '../../scripts/reset-project.mjs'
config() config()
...@@ -36,7 +36,7 @@ export async function generateProjects() { ...@@ -36,7 +36,7 @@ export async function generateProjects() {
{ {
title: 'Resetting project', title: 'Resetting project',
task: async () => { task: async () => {
await resetProject(ORIGIN_PROJECT_NAME) await resetProject(TEST_TEAM_NAME, ORIGIN_PROJECT_NAME)
}, },
}, },
{ {
...@@ -73,7 +73,7 @@ export async function generateProjects() { ...@@ -73,7 +73,7 @@ export async function generateProjects() {
{ {
title: 'Resetting project', title: 'Resetting project',
task: async () => { task: async () => {
await resetProject(HEAD_PROJECT_NAME) await resetProject(TEST_TEAM_NAME, HEAD_PROJECT_NAME)
}, },
}, },
{ {
...@@ -116,51 +116,6 @@ export async function cleanupProjectFolders() { ...@@ -116,51 +116,6 @@ export async function cleanupProjectFolders() {
]) ])
} }
async function resetProject(projectName) {
const deleteRes = await fetch(
`https://vercel.com/api/v8/projects/${encodeURIComponent(
projectName
)}?teamId=${TEST_TEAM_NAME}`,
{
method: 'DELETE',
headers: {
Authorization: `Bearer ${TEST_TOKEN}`,
},
}
)
if (!deleteRes.ok && deleteRes.status !== 404) {
throw new Error(
`Failed to delete project got status ${
deleteRes.status
}, ${await deleteRes.text()}`
)
}
const createRes = await fetch(
`https://vercel.com/api/v8/projects?teamId=${TEST_TEAM_NAME}`,
{
method: 'POST',
headers: {
'content-type': 'application/json',
Authorization: `Bearer ${TEST_TOKEN}`,
},
body: JSON.stringify({
framework: 'nextjs',
name: projectName,
}),
}
)
if (!createRes.ok) {
throw new Error(
`Failed to create project got status ${
createRes.status
}, ${await createRes.text()}`
)
}
}
export async function deployProject(projectName, appFolder) { export async function deployProject(projectName, appFolder) {
try { try {
const vercelFlags = ['--scope', TEST_TEAM_NAME] const vercelFlags = ['--scope', TEST_TEAM_NAME]
......
...@@ -4,12 +4,15 @@ export const TEST_PROJECT_NAME = 'vtest314-e2e-tests' ...@@ -4,12 +4,15 @@ export const TEST_PROJECT_NAME = 'vtest314-e2e-tests'
export const TEST_TEAM_NAME = process.env.VERCEL_TEST_TEAM export const TEST_TEAM_NAME = process.env.VERCEL_TEST_TEAM
export const TEST_TOKEN = process.env.VERCEL_TEST_TOKEN export const TEST_TOKEN = process.env.VERCEL_TEST_TOKEN
async function resetProject() { export async function resetProject(
teamId = TEST_TEAM_NAME,
projectName = TEST_PROJECT_NAME
) {
// TODO: error/bail if existing deployments are pending // TODO: error/bail if existing deployments are pending
const deleteRes = await fetch( const deleteRes = await fetch(
`https://vercel.com/api/v8/projects/${encodeURIComponent( `https://vercel.com/api/v8/projects/${encodeURIComponent(
TEST_PROJECT_NAME projectName
)}?teamId=${TEST_TEAM_NAME}`, )}?teamId=${teamId}`,
{ {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
...@@ -27,7 +30,7 @@ async function resetProject() { ...@@ -27,7 +30,7 @@ async function resetProject() {
} }
const createRes = await fetch( const createRes = await fetch(
`https://vercel.com/api/v8/projects?teamId=${TEST_TEAM_NAME}`, `https://vercel.com/api/v8/projects?teamId=${teamId}`,
{ {
method: 'POST', method: 'POST',
headers: { headers: {
...@@ -36,7 +39,7 @@ async function resetProject() { ...@@ -36,7 +39,7 @@ async function resetProject() {
}, },
body: JSON.stringify({ body: JSON.stringify({
framework: 'nextjs', framework: 'nextjs',
name: TEST_PROJECT_NAME, name: projectName,
}), }),
} }
) )
...@@ -50,10 +53,6 @@ async function resetProject() { ...@@ -50,10 +53,6 @@ async function resetProject() {
} }
console.log( console.log(
`Successfully created fresh Vercel project ${TEST_TEAM_NAME}/${TEST_PROJECT_NAME}` `Successfully created fresh Vercel project ${teamId}/${projectName}`
) )
} }
if (process.env.RESET_VC_PROJECT) {
resetProject().catch(console.error)
}
import { resetProject } from './reset-project.mjs'
resetProject().catch(console.error)
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
TEST_PROJECT_NAME, TEST_PROJECT_NAME,
TEST_TEAM_NAME, TEST_TEAM_NAME,
TEST_TOKEN, TEST_TOKEN,
} from '../../../scripts/reset-vercel-project.mjs' } from '../../../scripts/reset-project.mjs'
import fetch from 'node-fetch' import fetch from 'node-fetch'
import { Span } from 'next/src/trace' import { Span } from 'next/src/trace'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment