Merge pull request #6 from sean-m-sullivan/build_update

update build

Author: sean-m-sullivan

.github/workflow-config/kube/awx-operator.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: awx.ansible.com/v1beta1
+kind: AWX
+metadata:
+  name: awx
+spec:
+  service_type: nodeport
+  nodeport_port: 30080
+...

.github/workflow-config/kube/awx.yaml

@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  # Find the latest tag here: https://github.com/ansible/awx-operator/releases
+  - github.com/ansible/awx-operator/config/default?ref=1.0.0
+  - awx.yaml
+
+# Set the image tags to match the git version from above
+images:
+  - name: quay.io/ansible/awx-operator
+    newTag: 1.0.0
+
+# Specify a custom namespace in which to install AWX
+namespace: default
+...

.github/workflow-config/kube/awx_def.yml

@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  # Find the latest tag here: https://github.com/ansible/awx-operator/releases
+  - github.com/ansible/awx-operator/config/default?ref=1.0.0
+
+# Set the image tags to match the git version from above
+images:
+  - name: quay.io/ansible/awx-operator
+    newTag: 1.0.0
+
+# Specify a custom namespace in which to install AWX
+namespace: default
+...

.github/workflow-config/kube/kustomization.yaml

@@ -8,18 +8,12 @@ jobs:
     name: Deploy Tower to Minikube and run tests
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout awx operator
-        uses: actions/checkout@v2
-        with:
-          repository: ansible/awx-operator
 
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          path: controller_configuration
 
       - name: "Install dependencies"
-        run: pip install -r controller_configuration/.github/requirements.txt
+        run: pip install -r .github/requirements.txt
 
       - name: Setup Minikube
         uses: manusa/actions-setup-minikube@v2.4.2
@@ -35,17 +29,27 @@ jobs:
 
       - name: Setup awx operator
         run: |
-          minikube kubectl get deployments
           minikube kubectl create secret generic awx-admin-password -- --from-literal=password=password
           minikube addons enable ingress
           alias kubectl="minikube kubectl --"
-          make deploy NAMESPACE=default
-          kubectl apply -f controller_configuration/.github/workflow-config/kube/awx_def.yml
+
+      - name: kustomize awx operator
+        working-directory: .github/workflow-config
+        run: kustomize build . | kubectl apply -f -
 
       - name: Wait / Sleep
         uses: jakejarvis/wait-action@v0.1.0
         with:
-          time: '180s'
+          time: '30s'
+
+      - name: kustomize awx
+        working-directory: .github/workflow-config/kube
+        run: kustomize build . | kubectl apply -f -
+
+      - name: Wait / Sleep
+        uses: jakejarvis/wait-action@v0.1.0
+        with:
+          time: '30s'
 
       - name: Check service URL
         uses: nick-invision/retry@v2
@@ -68,15 +72,9 @@ jobs:
       - name: Display Versions
         run: which python && pip --version && ansible --version
 
-      - name: Checkout
-        uses: actions/checkout@v2
-
       - name: "Install Galaxy dependencies"
         run: ansible-galaxy collection install -r .github/collections/requirements.yml
 
-      - name: Check service password
-        run: echo "Service password is ${{ steps.service-password.outputs.SERVICEPASSWORD }}"
-
       - name: "Perform playbook tests"
         run: ansible-playbook examples/configure_controller.yml -e controller_hostname=${{ steps.service-url.outputs.SERVICEURL }}
 

.github/workflow-config/kube/namespace.yml

@@ -33,9 +33,8 @@ controller_workflows:
       - all_parents_must_converge: false
         identifier: node201
         unified_job_template: test-template-1
-        forks: 2
         instance_groups:
-          - test_instance_group
+          - default
         labels:
           - differential
           - differential2

.github/workflow-config/kustomization.yaml

@@ -44,10 +44,14 @@
         validate_certs: "{{ controller_validate_certs }}"
       register: result
       until: result.status == 200
-      retries: 20
+      retries: 10
       delay: 30
       ignore_errors: true
 
+    - name: "Show result of ping"
+      ansible.builtin.debug:
+        var: result
+
     - name: Sleep for 60 seconds and allow awx to come up.
       ansible.builtin.wait_for:
         timeout: 60