Ansible gradeable

.github/workflows/ci.yml

@@ -780,6 +780,31 @@ jobs:
           spec: cypress/e2e/Cypress-System/login.spec.js
           working-directory: ${{env.SUBMITTY_REPOSITORY}}/site
           browser: chrome
+
+      - name: Get API token
+        id: get_token
+        run: |
+          RESPONSE=$(curl -s -X POST -H "Content-Type: application/x-www-form-urlencoded" --data "user_id=instructor&password=instructor" http://localhost/api/token)
+          echo "$RESPONSE"
+          status=$(echo "$RESPONSE" | jq -r '.status')
+          if [ "$status" = "fail" ]; then
+            exit 1
+          fi
+          TOKEN=$(echo "$RESPONSE" | jq -r '.data.token')
+          echo "API_TOKEN=$TOKEN" >> $GITHUB_ENV
+
+      - name: Create Homework
+        run: |
+          cd .setup/ansible
+          ansible-playbook --private-key /home/runner/.ssh/id_rsa -e "ansible_user=runner submitty_homework_creation_api_url=http://localhost/api/term/course/upload submitty_homework_creation_api_key=${{ env.API_TOKEN }}" -i inventory/submitty playbooks/submitty_homework_creation.yml
+
+      - name: Run Ansible cypress test
+        uses: cypress-io/github-action@v6
+        with:
+          config: baseUrl=http://localhost
+          spec: cypress/e2e/Cypress-Ansible/ansible-course.spec.js
+          working-directory: ${{env.SUBMITTY_REPOSITORY}}/site
+          browser: chrome
 
       - name: Setup HTTP/2
         run: |
@@ -955,7 +980,7 @@ jobs:
           ssh -T localhost
           sudo systemctl start postgresql
 
-      - name: Run ansible script
+      - name: Run Ansible scripts
         shell: bash
         run: |
           cd .setup/ansible
@@ -968,6 +993,10 @@ jobs:
           sudo chmod -R a+rwx  ${SUBMITTY_INSTALL_DIR}
           sudo chmod -R a+rwx /tmp/
 
+      - name: Validate image
+        run: |
+          curl --show-error --fail --include http://localhost/authentication/login
+
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -984,10 +1013,28 @@ jobs:
         run: |
           npm ci
 
-      - name: Validate image
+      - name: Get API token
+        id: get_token
         run: |
-          curl --show-error --fail --include http://localhost/authentication/login
+          RESPONSE=$(curl -s -X POST -H "Content-Type: application/json" -d '{"user_id": "instructor", "password": "instructor"}' http://localhost/api/token)
+          echo "$RESPONSE"
+          status=$(echo "$RESPONSE" | jq -r '.status')
+          if [ "$status" = "fail" ]; then
+            exit 1
+          fi
+          TOKEN=$(echo "$RESPONSE" | jq -r '.data.token')
+          echo "API_TOKEN=$TOKEN" >> $GITHUB_ENV
+
+      - name: Debug env
+        if: failure()
+        run: |
+          echo ${{ env.API_TOKEN }} 
 
+      - name: Create Homework
+        run: |
+          cd .setup/ansible
+          ansible-playbook --private-key /home/runner/.ssh/id_rsa -e "ansible_user=runner submitty_homework_creation_api_url=http://localhost/api/term/course/upload submitty_homework_creation_api_key=${{ env.API_TOKEN }}" -i inventory/submitty playbooks/submitty_homework_creation.yml
+
       - name: Run Ansible cypress test
         uses: cypress-io/github-action@v6
         with:

.setup/ansible/playbooks/submitty_course_creation.yml

@@ -1,6 +1,7 @@
 ---
 - name: Submitty Course Creation
   hosts: submitty
+  remote_user: runner
   become: true
 
   vars:
@@ -49,7 +50,7 @@
         submitty_course_creation_lastname: lastname
         submitty_course_creation_email: email
 
-    - name: Add Instructors
+    - name: Add Instructor
       ansible.builtin.include_role:
         name: submitty_course_add_instructor
       vars:
@@ -61,7 +62,47 @@
         submitty_course_add_instructor_email: email
         submitty_course_add_instructor_password: instructor2
 
+    - name: Add runner
+      ansible.builtin.include_role:
+        name: submitty_course_add_instructor
+      vars:
+        submitty_course_add_instructor_term: term
+        submitty_course_add_instructor_course: course
+        submitty_course_add_instructor_username: runner
+        submitty_course_add_instructor_firstname: firstname
+        submitty_course_add_instructor_lastname: lastname
+        submitty_course_add_instructor_email: email
+        submitty_course_add_instructor_password: runner
+
     - name: Add Users
+      ansible.builtin.include_role:
+        name: submitty_add_user
+      vars:
+        submitty_add_user_username: "{{ user.username }}"
+        submitty_add_user_firstname: "{{ user.firstname }}"
+        submitty_add_user_lastname: "{{ user.lastname }}"
+        submitty_add_user_email: "{{ user.email }}"
+        submitty_add_user_password: "{{ user.password }}"
+      loop:
+        - username: aphacker
+          firstname: firstname
+          lastname: lastname
+          email: email
+          password: aphacker
+        - username: bitdiddle
+          firstname: firstname
+          lastname: lastname
+          email: email
+          password: bitdiddle
+        - username: adamsg
+          firstname: firstname
+          lastname: lastname
+          email: email
+          password: adamsg
+      loop_control:
+        loop_var: user
+
+    - name: Add users to course
       ansible.builtin.include_role:
         name: submitty_course_add_user
       vars:

.setup/ansible/playbooks/submitty_homework_creation.yml

@@ -0,0 +1,22 @@
+---
+- name: Submitty Homework Creation
+  hosts: localhost
+  remote_user: instructor
+  connection: local
+
+  tasks:
+    # This role is defined in the Submitty Repo under .setup/ansible/roles
+    - name: Create gradeable
+      ansible.builtin.include_role:
+        name: submitty_homework_creation
+
+  vars_prompt:
+    - name: submitty_homework_creation_api_url
+      prompt: Enter the full API url (http://{domain.com}/api/{semester}/{course}/upload)
+      private: no
+    - name: submitty_homework_creation_passed_api_key
+      prompt: Enter your API key
+      private: yes
+    - name: submitty_homework_creation_password
+      prompt: Enter your password
+      private: yes

.setup/ansible/playbooks/submitty_install.yml

@@ -4,7 +4,7 @@
 
 - name: Install Submitty
   hosts: submitty
-  remote_user: ubuntu
+  remote_user: runner
   become: true
   tasks:
     - name: Install Submitty

.setup/ansible/roles/submitty_add_user/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: Add student to submitty users.
   ansible.builtin.expect:
-    command: ./adduser.py "{{ submitty_add_user_username }}"
+    command: "./adduser.py {{ submitty_add_user_username }}"
     chdir: /usr/local/submitty/sbin/
     echo: true
     responses:
-      (?m)^User givenname: "{{ submitty_add_user_username }}"
+      (?m)^User givenname: "{{ submitty_add_user_firstname }}"
       (?m)^User preferred name: "{{ submitty_add_user_firstname }}"
       (?m)^User familyname: "{{ submitty_add_user_lastname }}"
       (?m)^User email: "{{ submitty_add_user_email }}"

.setup/ansible/roles/submitty_course_add_user/tasks/main.yml

@@ -1,20 +1,5 @@
 ---
 # Assumes that local user accounts already exist.
-
-- name: Add student to submitty users.
-  ansible.builtin.expect:
-    command: ./adduser.py "{{ submitty_course_add_user_username }}"
-    chdir: /usr/local/submitty/sbin/
-    echo: true
-    responses:
-      (?m)^User givenname: "{{ submitty_course_add_user_username }}"
-      (?m)^User preferred name: "{{ submitty_course_add_user_firstname }}"
-      (?m)^User familyname: "{{ submitty_course_add_user_lastname }}"
-      (?m)^User email: "{{ submitty_course_add_user_email }}"
-      (?m)^User password: "{{ submitty_course_add_user_password }}"
-  become: true
-  become_user: root
-
 - name: Add existing students to the course database.
   ansible.builtin.command:
     cmd: ./adduser_course.py "{{ submitty_course_add_user_username }}"

.setup/ansible/roles/submitty_course_creation/tasks/main.yml

@@ -15,6 +15,20 @@
   vars:
     course_name: "{{ submitty_course_creation_course }}"
 
+- name: Add instructors to submitty users.
+  ansible.builtin.expect:
+    command: ./adduser.py "{{ submitty_course_creation_username }}"
+    chdir: /usr/local/submitty/sbin/
+    echo: true
+    responses:
+      (?m)^User givenname: "{{ submitty_course_creation_firstname }}"
+      (?m)^User preferred name: "{{ submitty_course_creation_firstname }}"
+      (?m)^User familyname: "{{ submitty_course_creation_lastname }}"
+      (?m)^User email: "{{ submitty_course_creation_email }}"
+      (?m)^User password: NotUsedWithLdap
+  become: true
+  become_user: root
+
 - name: Add instructors to the course groups.
   ansible.builtin.user:
     name: "{{ submitty_course_creation_username }}"
@@ -77,20 +91,6 @@
     recurse: true
     mode: g+s
 
-- name: Add instructors to submitty users.
-  ansible.builtin.expect:
-    command: ./adduser.py "{{ submitty_course_creation_username }}"
-    chdir: /usr/local/submitty/sbin/
-    echo: true
-    responses:
-      (?m)^User givenname: "{{ submitty_course_creation_firstname }}"
-      (?m)^User preferred name: "{{ submitty_course_creation_firstname }}"
-      (?m)^User familyname: "{{ submitty_course_creation_lastname }}"
-      (?m)^User email: "{{ submitty_course_creation_email }}"
-      (?m)^User password: NotUsedWithLdap
-  become: true
-  become_user: root
-
 # Prepare the course directory and course database.
 # Assumes top-level Submitty database exists.