Auto deploy 2 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

wisedrette wants to merge 35 commits into master from auto-deploy-2

.squash.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,144 +2,28 @@ deployments: @@
       default:
         vm_size: 2G
         vm_storage_gb: 10G
-        ready_wait: 20
-        some_field: 123
-        backend_wait: abc
-        success_response_check_url: /about
-        dc_skip_docker_build: false
-        environment:
-          - TEST_VAL=a42
-          - SOMETHING=${SQUASH_BRANCH_WITH_ID}ABC
-          - REGISTRY_PASSWORD=$REGISTRY_PASSWORD
-          - ${SQUASH_BRANCH_WITH_ID}ABC=abcde
-          - $TEST_VAL=test
-          - TEST_VAL2=abcd!?#$&&_123
-        copy_files: /${TEST_VAL}ABC ~/code
-        auto_deploy_on_commits: true asd
+        ready_wait: 120
+        copy_files: /abcd ~/code
+        auto_deploy_disable_cache: true
+        auto_deploy_on_commits: true
         squash_pr_comments: true
-        build_options: --build-arg SOMETHING=$SQUASH_BRANCH
-        allow_private_ports: 41234, 1010
-        allow_public_ports: 8888, 48000
-        subdomain_port_mapping:
-          - test:80
-          - test--test:80
-          - another-test:8000
-          - and--another-test:8000
-        deployment_page_commands:
-          list something:
-            - ls -la ./
-            - sleep 40 && echo branch id is $SQUASH_BRANCH_WITH_ID
-          echo awesome:
-            - echo awesome
-          echo target:
-            stuff-service:
-              - echo awesome
-        pre_launch:
-          - target: stuff-service
-            command: exec
-            options: "{target} bash -c 'ls -la ./'"
-        post_launch:
-          - target: stuff-service
-            command: exec
-            options: "{target} bash -c 'echo test && echo test > test'"
-      /PI:
+        auto_deploy_ttl: 30m
+        auto_deploy_post_launch_commands:
+          default:
+            - echo true
+            - python ./selenium_test.py
+      branch:
         vm_size: 1
-        vm_storage_gb: 130
-        deployment_type: docker
-        environment:
-          TEST_VAL=a42
-        ready_wait:
-        filename:
-          ./stuff/Dockerfile
-        dockerfileonly: true
-        build_options: --build-arg TEST_VAL2 --build-arg TEST_VAL
-        run_options: --hostname ${SQUASH_BRANCH_WITH_ID} --env TEST_VAL2=$SQUASH_BRANCH_WITH_ID --restart always --env TEST --env TEST1=${TEST1} --env TEST2=${TEST2} --env=TEST_A_NEW
-        context_path: ./stuff
-        subdomains:
-          Awesome Name:
-            - awesomedomain,/?que=99764QQ
-          Awesomness x2:
-             - subd,/abc
-          Awesomness x3:
-             - plain
-        deployment_page_commands:
-          list something:
-            - ls -la ./
-            - sleep 40 && echo branch id is $SQUASH_BRANCH_WITH_ID
-      branchA:
-        vm_size: 6
-        environment:
-          TEST_VAL=4242
-        ready_wait:
-        filename:
-          ./stuff/DockerfileA
+        vm_storage_gb: 13
+        auto_deploy_disable_cache: true
+        auto_deploy_on_commits: false
+        auto_deploy_ttl: 5h
+        ready_wait: 120
+        filename: ./stuff/Dockerfile
         dockerfileonly: true
-        build_options: --build-arg TEST_VAL --build-arg TEST_VAL2
-        run_options: --env TEST_VAL2=43 --env TEST_VAL3=$SQUASH_BRANCH_WITH_ID
         context_path: ./stuff
-        pre_launch:
-          - command: cp
-            target: brancha
-            docker: true
-            options: ".ssh/id_rsa {target}:/test"
-          - target: brancha
-            command: exec
-            docker: true
-            options: -it {target} bash -c 'env > .env.local'
-        post_launch:
-          - command: exec
-            target: brancha
-            docker: true
-            options: "-it {target} bash -c 'echo TEST_VAL is $TEST_VAL'"
-      branch_B:
-        vm_size: 1GB
-        environment:
-          TEST_VAL=424242
-        ready_wait:
-        filename:
-          ./stuff/DockerfileB
-        dockerfileonly: true
-        run_options: --env TEST_VAL2=$SQUASH_DOMAIN
-        context_path: ./stuff
-        pre_launch:
-          - target: branchB
-            command: exec
-            docker: true
-            options: -it {target} bash -c 'env > .env.local'
-        post_launch:
-          - target: branchB
-            command: exec
-            docker: true
-            options: -it {target} bash -c 'echo TEST_VAL2 is $TEST_VAL2'
-          - target: branchB
-            command: exec
-            docker: true
-            options: -it {target} bash -c 'echo TEST_VAL is $TEST_VAL'
-      docker Q:
-        ready_wait: 10
-        filename:
-          ./stuff/DockerfileQ
-        context_path: ./stuff
-      branchCompose:
-        pre_launch:
-          - target: stuff-service
-            command: exec
-            options: "{target} bash -c 'ls -la ./'"
-        post_launch:
-          - target: stuff-service
-            command: run
-            options: "{target} bash -c 'echo test && echo test > test'"
-        filename:
-          ./docker-compose.yml
-      nodocker:
-        auto_deploy_on_commits: true
-        dockerimage:
-          r.cfcr.io/wisedrette/wisedrette/dockertest:master
-        docker_registry:
-          server: r.cfcr.io
-          username: wisedrette
-          password: $REGISTRY_PASSWORD
+        pipelines:
+          - default:
+              scripts:
+                - ls -la

docker-compose.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,11 +6,6 @@ services: @@
           - 80:80
           - 3000:80
         environment:
-          - TEST_VAL
-          - TEST_VAL2
-          - TEST
-          - TEST1
-          - TEST2
           - SQUASH_BRANCH_WITH_ID
           - SQUASH_DOMAIN
           - SQUASH_MASTER_DEPLOYMENT
@@ Expand Down @@

stuff/Dockerfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,6 @@
  
    FROM python:3.6-onbuild

    FROM joyzoursky/python-chromedriver:3.6-selenium

    COPY . /usr/src/app

    WORKDIR /usr/src/app

    RUN pip install -r requirements.txt

    CMD ["bash", "run_server.sh"]

stuff/DockerfileA

This file was deleted.

stuff/DockerfileB

This file was deleted.

stuff/DockerfileQ

This file was deleted.

stuff/requirements.txt

Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		flask
		selenium==3.13.0

stuff/selenium_test.py

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    #!/usr/bin/env python3.6
+    import os
+    import sys
+    from selenium import webdriver
+    from selenium.webdriver.common.keys import Keys
+    from selenium.common.exceptions import NoSuchElementException
+    chrome_options = webdriver.ChromeOptions()
+    chrome_options.add_argument('--no-sandbox')
+    chrome_options.add_argument('--window-size=1420,1080')
+    chrome_options.add_argument('--headless')
+    chrome_options.add_argument('--disable-gpu')
+    driver = webdriver.Chrome(chrome_options=chrome_options)
+    driver.get('https://{}'.format(os.environ.get('SQUASH_DOMAIN', '')))
+    try:
+        driver.find_element_by_tag_name('body')
+        driver.close()
+        sys.exit(0)
+    except NoSuchElementException:
+        sys.exit(1)

stuff/server.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ def run_job(): @@
     @app.route('/')
     def index():
         logging.warning(request.referrer)
-        return '<body>Hello world. <a href="/about/">About this page</a>.</body>'
+        return '<body>Hello new world. <a href="/about/">About this page</a>.</body>'
     @app.route('/about/')
@@ Expand Down @@

stuff/serverA.py

This file was deleted.

stuff/serverB.py

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Auto deploy 2 #65

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Auto deploy 2 #65

Are you sure you want to change the base?

Uh oh!

Auto deploy 2 #65

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!