diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml index 5a68ad9568..025b604c1a 100644 --- a/.github/workflows/uffizzi-build.yml +++ b/.github/workflows/uffizzi-build.yml @@ -25,21 +25,17 @@ jobs: node-version: 16.x registry-url: https://registry.npmjs.org/ - - name: backstage create-app | delete if already exists + - name: yarn install run: | - rm -rf ./example-app - node ./packages/e2e-test/.bin/e2e-test create -o ./example-app - env: - BACKSTAGE_APP_NAME: example-app + yarn install + + - name: Use Uffizzi's backstage app config + run: | + cp -f ./backstage/.github/uffizzi/uffizzi.production.app-config.yaml ./app-config.production.yaml; - name: yarn build run: | yarn build:all - working-directory: ./example-app - - - name: Use Uffizzi's backstage app config - run: | - cp ./backstage/.github/uffizzi/uffizzi.production.app-config.yaml ./example-app/app-config.production.yaml; - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -55,15 +51,11 @@ jobs: images: registry.uffizzi.com/${{ env.UUID_TAG_APP }} tags: type=raw,value=60d - - name: Add examples directory to Dockerfile - run: | - echo "COPY examples /examples" >> ./example-app/packages/backend/Dockerfile - - name: Build Image uses: docker/build-push-action@v2 with: context: example-app - file: example-app/packages/backend/Dockerfile + file: packages/backend/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} push: true diff --git a/packages/e2e-test/src/commands/index.ts b/packages/e2e-test/src/commands/index.ts index db9ea225a3..4a7cb7272b 100644 --- a/packages/e2e-test/src/commands/index.ts +++ b/packages/e2e-test/src/commands/index.ts @@ -19,5 +19,4 @@ import { run, create } from './run'; export function registerCommands(program: Command) { program.command('run').description('Run e2e tests').action(run); - program.command('create').option('-o, --output ').action(create); } diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index b022862c8c..3eedb90b21 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -43,24 +43,6 @@ const templatePackagePaths = [ 'packages/create-app/templates/default-app/packages/backend/package.json.hbs', ]; -export async function create({ output }: { output: string }) { - const outputDir = resolvePath(process.cwd(), output); - - const rootDir = await fs.mkdtemp(resolvePath(os.tmpdir(), 'backstage-e2e-')); - print(`CLI E2E test root: ${rootDir}\n`); - - print('Building dist workspace'); - const workspaceDir = await buildDistWorkspace('workspace', rootDir); - - // // Otherwise yarn will refuse to install with CI=true - process.env.YARN_ENABLE_IMMUTABLE_INSTALLS = 'false'; - - print('Creating a Backstage App'); - const appDir = await createApp('test-app', workspaceDir, rootDir); - - await fs.move(appDir, outputDir, { overwrite: true }); -} - export async function run() { const rootDir = await fs.mkdtemp(resolvePath(os.tmpdir(), 'backstage-e2e-')); print(`CLI E2E test root: ${rootDir}\n`);