diff --git a/Deployment 6 Documentation - Ken.pdf b/Deployment 6 Documentation - Ken.pdf new file mode 100644 index 00000000..9de9e676 Binary files /dev/null and b/Deployment 6 Documentation - Ken.pdf differ diff --git a/kura_test_repo/Jenkinsfile b/Jenkinsfile similarity index 65% rename from kura_test_repo/Jenkinsfile rename to Jenkinsfile index b6f5f79b..5b6ed181 100644 --- a/kura_test_repo/Jenkinsfile +++ b/Jenkinsfile @@ -1,17 +1,22 @@ pipeline { - agent any + agent { + label 'build' + } stages { stage ('Build') { steps { - sh 'rm -rf ./kura_test_repo/cypress2' + sh 'rm -rf ./cypress' sh ''' npm install + npm run build + sudo npm install -g serve + serve -s build & ''' } } - stage ('Second') { + stage ('Test') { agent { - label 'React-dev' + label 'test' } steps { sh ''' diff --git a/README.md b/README.md index 25e57d5b..8257e0e0 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,13 @@ -# DEPLOY6_FE -

Deployment 6

- -Welcome to deployment 6, for this deployment you will need to follow the directions in the deployment6.pdf. - -- Be sure to include the following below in your pull request: - -***Requirements:*** -- [x]Document issues and anything you decided to do different.. -- [x]Generate a failed and passed test. -- [x]Take a screenshots of your failed and passed test. -- [x]Locate and upload cypress's screenshot and video of the headless browser test. - -👉Link to deployment instructions: [here](https://github.com/kura-labs-org/DEPLOY6_FE/blob/main/Deployment%236.pdf) - -![image](https://i.morioh.com/210507/ac11056f.webp) +Deployment 6 + +Goals of the Deployment: +- Have master ec2 orchestrate building and testing in different agents +- Testing would be done on the “testing” agent using cypress +- Have one successful test and one failed test + +For more details on the deployment, you can look [here](https://github.com/KennethT404/DEPLOY6_FE/blob/main/Deployment%206%20Documentation%20-%20Ken.pdf) for more!
+Instructions for the deployment can be found [here](https://github.com/KennethT404/DEPLOY6_FE/blob/main/Deployment%236.pdf) + +This deployment was a demonstration of Masters and Agents can be used for different envrionemtns for an appliction. In this case there was a test agent anda build agent. This is meant to simulate what Dev and Production environments at an enterprise level would function. This was done in Jenkins because of its ability to easily implement agent nodes to work with the master node it is hosted on. + +The reason for this seperation is to ensure that changes that may break the app do not get shown or interfere with the live application being served. This also allows for developers to conduct different types of testing such as additonal features or new UI. diff --git a/kura_test_repo/cypress.json b/cypress.json similarity index 100% rename from kura_test_repo/cypress.json rename to cypress.json diff --git a/kura_test_repo/cypress/fixtures/example.json b/cypress/fixtures/example.json similarity index 100% rename from kura_test_repo/cypress/fixtures/example.json rename to cypress/fixtures/example.json diff --git a/kura_test_repo/cypress/integration/1-getting-started/todo.spec.js b/cypress/integration/1-getting-started/todo.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/1-getting-started/todo.spec.js rename to cypress/integration/1-getting-started/todo.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/actions.spec.js b/cypress/integration/2-advanced-examples/actions.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/actions.spec.js rename to cypress/integration/2-advanced-examples/actions.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/aliasing.spec.js b/cypress/integration/2-advanced-examples/aliasing.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/aliasing.spec.js rename to cypress/integration/2-advanced-examples/aliasing.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/assertions.spec.js b/cypress/integration/2-advanced-examples/assertions.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/assertions.spec.js rename to cypress/integration/2-advanced-examples/assertions.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/connectors.spec.js b/cypress/integration/2-advanced-examples/connectors.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/connectors.spec.js rename to cypress/integration/2-advanced-examples/connectors.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/cookies.spec.js b/cypress/integration/2-advanced-examples/cookies.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/cookies.spec.js rename to cypress/integration/2-advanced-examples/cookies.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/cypress_api.spec.js b/cypress/integration/2-advanced-examples/cypress_api.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/cypress_api.spec.js rename to cypress/integration/2-advanced-examples/cypress_api.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/files.spec.js b/cypress/integration/2-advanced-examples/files.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/files.spec.js rename to cypress/integration/2-advanced-examples/files.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/local_storage.spec.js b/cypress/integration/2-advanced-examples/local_storage.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/local_storage.spec.js rename to cypress/integration/2-advanced-examples/local_storage.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/location.spec.js b/cypress/integration/2-advanced-examples/location.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/location.spec.js rename to cypress/integration/2-advanced-examples/location.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/misc.spec.js b/cypress/integration/2-advanced-examples/misc.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/misc.spec.js rename to cypress/integration/2-advanced-examples/misc.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/navigation.spec.js b/cypress/integration/2-advanced-examples/navigation.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/navigation.spec.js rename to cypress/integration/2-advanced-examples/navigation.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/network_requests.spec.js b/cypress/integration/2-advanced-examples/network_requests.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/network_requests.spec.js rename to cypress/integration/2-advanced-examples/network_requests.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/querying.spec.js b/cypress/integration/2-advanced-examples/querying.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/querying.spec.js rename to cypress/integration/2-advanced-examples/querying.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/spies_stubs_clocks.spec.js b/cypress/integration/2-advanced-examples/spies_stubs_clocks.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/spies_stubs_clocks.spec.js rename to cypress/integration/2-advanced-examples/spies_stubs_clocks.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/traversal.spec.js b/cypress/integration/2-advanced-examples/traversal.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/traversal.spec.js rename to cypress/integration/2-advanced-examples/traversal.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/utilities.spec.js b/cypress/integration/2-advanced-examples/utilities.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/utilities.spec.js rename to cypress/integration/2-advanced-examples/utilities.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/viewport.spec.js b/cypress/integration/2-advanced-examples/viewport.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/viewport.spec.js rename to cypress/integration/2-advanced-examples/viewport.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/waiting.spec.js b/cypress/integration/2-advanced-examples/waiting.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/waiting.spec.js rename to cypress/integration/2-advanced-examples/waiting.spec.js diff --git a/kura_test_repo/cypress/integration/2-advanced-examples/window.spec.js b/cypress/integration/2-advanced-examples/window.spec.js similarity index 100% rename from kura_test_repo/cypress/integration/2-advanced-examples/window.spec.js rename to cypress/integration/2-advanced-examples/window.spec.js diff --git a/kura_test_repo/cypress/integration/test.spec.js b/cypress/integration/test.spec.js similarity index 74% rename from kura_test_repo/cypress/integration/test.spec.js rename to cypress/integration/test.spec.js index a4311cdd..57594e56 100644 --- a/kura_test_repo/cypress/integration/test.spec.js +++ b/cypress/integration/test.spec.js @@ -1,6 +1,6 @@ describe('Heading', () => { it('has the right title', () => { - cy.visit('http://172.31.31.38:5000/example-1') + cy.visit('http://172.31.88.114:5000/example-1') cy.get('h1') .invoke('text') diff --git a/kura_test_repo/cypress/plugins/index.js b/cypress/plugins/index.js similarity index 100% rename from kura_test_repo/cypress/plugins/index.js rename to cypress/plugins/index.js diff --git a/kura_test_repo/cypress/support/commands.js b/cypress/support/commands.js similarity index 100% rename from kura_test_repo/cypress/support/commands.js rename to cypress/support/commands.js diff --git a/kura_test_repo/cypress/support/index.js b/cypress/support/index.js similarity index 100% rename from kura_test_repo/cypress/support/index.js rename to cypress/support/index.js diff --git a/kura_test_repo/README.md b/kura_test_repo/README.md deleted file mode 100644 index c4039ccf..00000000 --- a/kura_test_repo/README.md +++ /dev/null @@ -1,68 +0,0 @@ -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `npm start` - -Runs the app in the development mode.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.
-You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.
-It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.
-Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting - -### Analyzing the Bundle Size - -This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size - -### Making a Progressive Web App - -This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app - -### Advanced Configuration - -This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration - -### Deployment - -This section has moved here: https://facebook.github.io/create-react-app/docs/deployment - -### `npm run build` fails to minify - -This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify diff --git a/kura_test_repo/package-lock.json b/package-lock.json similarity index 100% rename from kura_test_repo/package-lock.json rename to package-lock.json diff --git a/kura_test_repo/package.json b/package.json similarity index 100% rename from kura_test_repo/package.json rename to package.json diff --git a/kura_test_repo/public/favicon.ico b/public/favicon.ico similarity index 100% rename from kura_test_repo/public/favicon.ico rename to public/favicon.ico diff --git a/kura_test_repo/public/index.html b/public/index.html similarity index 100% rename from kura_test_repo/public/index.html rename to public/index.html diff --git a/kura_test_repo/public/logo192.png b/public/logo192.png similarity index 100% rename from kura_test_repo/public/logo192.png rename to public/logo192.png diff --git a/kura_test_repo/public/logo512.png b/public/logo512.png similarity index 100% rename from kura_test_repo/public/logo512.png rename to public/logo512.png diff --git a/kura_test_repo/public/manifest.json b/public/manifest.json similarity index 100% rename from kura_test_repo/public/manifest.json rename to public/manifest.json diff --git a/kura_test_repo/public/robots.txt b/public/robots.txt similarity index 100% rename from kura_test_repo/public/robots.txt rename to public/robots.txt diff --git a/screenshot of passed and failed jenknins builds.PNG b/screenshot of passed and failed jenknins builds.PNG new file mode 100644 index 00000000..23ca3795 Binary files /dev/null and b/screenshot of passed and failed jenknins builds.PNG differ diff --git a/kura_test_repo/src/App.css b/src/App.css similarity index 100% rename from kura_test_repo/src/App.css rename to src/App.css diff --git a/kura_test_repo/src/App.js b/src/App.js similarity index 100% rename from kura_test_repo/src/App.js rename to src/App.js diff --git a/kura_test_repo/src/App.test.js b/src/App.test.js similarity index 100% rename from kura_test_repo/src/App.test.js rename to src/App.test.js diff --git a/kura_test_repo/src/index.css b/src/index.css similarity index 100% rename from kura_test_repo/src/index.css rename to src/index.css diff --git a/kura_test_repo/src/index.js b/src/index.js similarity index 100% rename from kura_test_repo/src/index.js rename to src/index.js diff --git a/kura_test_repo/src/logo.svg b/src/logo.svg similarity index 100% rename from kura_test_repo/src/logo.svg rename to src/logo.svg diff --git a/kura_test_repo/src/pages/Example1Page.js b/src/pages/Example1Page.js similarity index 100% rename from kura_test_repo/src/pages/Example1Page.js rename to src/pages/Example1Page.js diff --git a/kura_test_repo/src/pages/Example2Page.js b/src/pages/Example2Page.js similarity index 100% rename from kura_test_repo/src/pages/Example2Page.js rename to src/pages/Example2Page.js diff --git a/kura_test_repo/src/pages/Example3Page.js b/src/pages/Example3Page.js similarity index 100% rename from kura_test_repo/src/pages/Example3Page.js rename to src/pages/Example3Page.js diff --git a/kura_test_repo/src/pages/Example4Page.js b/src/pages/Example4Page.js similarity index 100% rename from kura_test_repo/src/pages/Example4Page.js rename to src/pages/Example4Page.js diff --git a/kura_test_repo/src/pages/HomePage.js b/src/pages/HomePage.js similarity index 100% rename from kura_test_repo/src/pages/HomePage.js rename to src/pages/HomePage.js diff --git a/kura_test_repo/src/pages/NotFoundPage.js b/src/pages/NotFoundPage.js similarity index 100% rename from kura_test_repo/src/pages/NotFoundPage.js rename to src/pages/NotFoundPage.js diff --git a/kura_test_repo/src/pages/index.js b/src/pages/index.js similarity index 100% rename from kura_test_repo/src/pages/index.js rename to src/pages/index.js diff --git a/kura_test_repo/src/serviceWorker.js b/src/serviceWorker.js similarity index 100% rename from kura_test_repo/src/serviceWorker.js rename to src/serviceWorker.js diff --git a/test.spec.js[fail].mp4 b/test.spec.js[fail].mp4 new file mode 100644 index 00000000..cafa8bb1 Binary files /dev/null and b/test.spec.js[fail].mp4 differ diff --git a/test.spec.js[success].mp4 b/test.spec.js[success].mp4 new file mode 100644 index 00000000..f114331e Binary files /dev/null and b/test.spec.js[success].mp4 differ