st2sandbox

st2sandbox · Mar 23, 2021 · c2bf38c · c2bf38c
1 parent 245956d
commit c2bf38c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ on:
     type: [opened, reopened, edited]
     branches:
       # Only for PRs targeting those branches
+      - main
       - master
       - v[0-9]+.[0-9]+
   schedule:

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ language: python
 
 branches:
   only:
+    - main
     - master
     - /^v[0-9]+\.[0-9]+$/
 
@@ -114,16 +115,6 @@ before_script:
   - ls -l /etc/rabbitmq
   - ls -l /home/travis
   - ls -l /home/travis/build
-  - ls -l /home/travis/build/StackStorm
-  - ls -l /home/travis/build/StackStorm/st2
-  - ls -l /home/travis/build/StackStorm/st2/st2tests
-  - ls -l /home/travis/build/StackStorm/st2/st2tests/st2tests
-  - ls -l /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures
-  - ls -l /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs
-  - ls -l /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/ca
-  - ls -l /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/server
-  - cat /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/ca/ca_certificate_bundle.pem
-  - cat /home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/server/server_certificate.pem
   # Install rabbitmq_management RabbitMQ plugin
   - sudo service rabbitmq-server restart ; sleep 5
   - sudo rabbitmq-plugins enable rabbitmq_management

diff --git a/scripts/travis/rabbitmq.config b/scripts/travis/rabbitmq.config
@@ -1,9 +1,9 @@
 [
   {rabbit, [
      {ssl_listeners, [5671]},
-     {ssl_options, [{cacertfile, "/home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/ca/ca_certificate_bundle.pem"},
-                    {certfile,   "/home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/server/server_certificate.pem"},
-                    {keyfile,    "/home/travis/build/StackStorm/st2/st2tests/st2tests/fixtures/ssl_certs/server/private_key.pem"},
+     {ssl_options, [{cacertfile, "/home/travis/build/st2sandbox/st2/st2tests/st2tests/fixtures/ssl_certs/ca/ca_certificate_bundle.pem"},
+                    {certfile,   "/home/travis/build/st2sandbox/st2/st2tests/st2tests/fixtures/ssl_certs/server/server_certificate.pem"},
+                    {keyfile,    "/home/travis/build/st2sandbox/st2/st2tests/st2tests/fixtures/ssl_certs/server/private_key.pem"},
                     {verify,     verify_peer},
                     {fail_if_no_peer_cert, false}]}
    ]}