From e68d98e7056c8b84df45873184bd3f1da7da1f26 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 26 Jun 2024 18:39:58 -0800 Subject: [PATCH 01/21] Initial tests --- .github/workflows/submitty_ci.yml | 11 ++++++++-- .../playbooks/submitty_course_creation.yml | 20 ++++++++++++++----- .../roles/submitty_add_user/tasks/main.yml | 14 +++++++++++++ .../Cypress-Ansible/ansible-course.spec.js | 7 +++++++ 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 .setup/ansible/roles/submitty_add_user/tasks/main.yml create mode 100644 site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js diff --git a/.github/workflows/submitty_ci.yml b/.github/workflows/submitty_ci.yml index aed9db58318..648cdc79c01 100644 --- a/.github/workflows/submitty_ci.yml +++ b/.github/workflows/submitty_ci.yml @@ -551,8 +551,7 @@ jobs: - name: Run integration tests run: sudo -E env "PATH=$PATH" python3 /usr/local/submitty/test_suite/integrationTests/run.py - - ansible-install: + ansible-ci: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -570,8 +569,16 @@ jobs: run: | cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml + ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - name: Validate image run: curl --show-error --fail --include http://localhost/authentication/login + - 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 - uses: actions/upload-artifact@v4 if: failure() with: diff --git a/.setup/ansible/playbooks/submitty_course_creation.yml b/.setup/ansible/playbooks/submitty_course_creation.yml index 7eda0a79f9d..dcda766d62f 100644 --- a/.setup/ansible/playbooks/submitty_course_creation.yml +++ b/.setup/ansible/playbooks/submitty_course_creation.yml @@ -16,6 +16,16 @@ submitty_term_creation_start_date: 01/01/2024 submitty_term_creation_end_date: 06/07/2024 + - name: Add instructor + ansible.builtin.include_role: + name: submitty_add_user + vars: + submitty_course_add_user_username: instructor + submitty_course_add_user_firstname: instructor + submitty_course_add_user_lastname: Quinn + submitty_course_add_user_email: email + submitty_course_add_user_password: instructor + - name: Course Creation ansible.builtin.include_role: name: submitty_course_creation @@ -38,7 +48,7 @@ submitty_course_add_instructor_firstname: firstname submitty_course_add_instructor_lastname: lastname submitty_course_add_instructor_email: email - submitty_course_add_instructor_password: password + submitty_course_add_instructor_password: instructor2 - name: Add Users ansible.builtin.include_role: @@ -56,16 +66,16 @@ firstname: firstname lastname: lastname email: email - password: password - - username: bitddle + password: aphacker + - username: bitdiddle firstname: firstname lastname: lastname email: email - password: password + password: bitdiddle - username: adamsg firstname: firstname lastname: lastname email: email - password: password + password: adamsg loop_control: loop_var: user diff --git a/.setup/ansible/roles/submitty_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_add_user/tasks/main.yml new file mode 100644 index 00000000000..28160147cf4 --- /dev/null +++ b/.setup/ansible/roles/submitty_add_user/tasks/main.yml @@ -0,0 +1,14 @@ +--- +- name: Add student to submitty users. + ansible.builtin.expect: + command: ./adduser.py "{{ submitty_add_user_username }}" + chdir: /usr/local/submitty/sbin/ + echo: true + responses: + (?m)^User givenname: "{{ submitty_add_user_username }}" + (?m)^User preferred name: "{{ submitty_add_user_firstname }}" + (?m)^User familyname: "{{ submitty_add_user_lastname }}" + (?m)^User email: "{{ submitty_add_user_email }}" + (?m)^User password: "{{ submitty_add_user_password }}" + become: true + become_user: root \ No newline at end of file diff --git a/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js b/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js new file mode 100644 index 00000000000..70bf24b4bc7 --- /dev/null +++ b/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js @@ -0,0 +1,7 @@ +describe('Testing Ansible Scripts', () => { + + it('should work', () => { + cy.login('instructor'); + cy.visit('term', 'course'); + }); +}); \ No newline at end of file From 4d30b1daf331c95d05af70b6cd2fa123ad320a35 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 26 Jun 2024 19:09:20 -0800 Subject: [PATCH 02/21] Fix variable names --- .setup/ansible/playbooks/submitty_course_creation.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.setup/ansible/playbooks/submitty_course_creation.yml b/.setup/ansible/playbooks/submitty_course_creation.yml index dcda766d62f..318bc9cd64e 100644 --- a/.setup/ansible/playbooks/submitty_course_creation.yml +++ b/.setup/ansible/playbooks/submitty_course_creation.yml @@ -20,11 +20,11 @@ ansible.builtin.include_role: name: submitty_add_user vars: - submitty_course_add_user_username: instructor - submitty_course_add_user_firstname: instructor - submitty_course_add_user_lastname: Quinn - submitty_course_add_user_email: email - submitty_course_add_user_password: instructor + submitty_add_user_username: instructor + submitty_add_user_firstname: instructor + submitty_add_user_lastname: Quinn + submitty_add_user_email: email + submitty_add_user_password: instructor - name: Course Creation ansible.builtin.include_role: From 72f41c26a84a3b7e84034b96c8b47fe9e01a3471 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 18:19:23 -0800 Subject: [PATCH 03/21] add registration section --- .setup/ansible/roles/submitty_course_add_user/defaults/main.yml | 1 + .setup/ansible/roles/submitty_course_add_user/tasks/main.yml | 1 + .setup/ansible/roles/submitty_course_creation/defaults/main.yml | 1 + .setup/ansible/roles/submitty_course_creation/tasks/main.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml b/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml index 3a11368fdc8..0254baf0807 100644 --- a/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml @@ -1,2 +1,3 @@ --- submitty_course_add_user_user_group: 4 +submitty_course_creation_registration_section: None \ No newline at end of file diff --git a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml index 3cce7f3add9..01528804749 100644 --- a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml @@ -19,6 +19,7 @@ ansible.builtin.command: cmd: ./adduser_course.py "{{ submitty_course_add_user_username }}" "{{ submitty_course_add_user_term }}" "{{ submitty_course_add_user_course }}" + "{{ submitty_course_creation_registration_section }}" "{{ submitty_course_add_user_user_group }}" chdir: /usr/local/submitty/sbin/ register: add_user_result diff --git a/.setup/ansible/roles/submitty_course_creation/defaults/main.yml b/.setup/ansible/roles/submitty_course_creation/defaults/main.yml index c41649f645e..c090f0af8c9 100644 --- a/.setup/ansible/roles/submitty_course_creation/defaults/main.yml +++ b/.setup/ansible/roles/submitty_course_creation/defaults/main.yml @@ -1,2 +1,3 @@ --- submitty_course_creation_user_group: 1 +submitty_course_creation_registration_section: None \ No newline at end of file diff --git a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml index 7dfcc177dc7..af3e06fc9ad 100644 --- a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml @@ -110,6 +110,7 @@ ansible.builtin.command: cmd: ./adduser_course.py "{{ submitty_course_creation_username }}" "{{ submitty_course_creation_term }}" "{{ submitty_course_creation_course }}" + "{{ submitty_course_creation_registration_section }}" "{{ submitty_course_creation_user_group }}" chdir: /usr/local/submitty/sbin/ become: true From d16fed2568bccfa9572f9b4d1c863d142ec80566 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 19:23:49 -0800 Subject: [PATCH 04/21] supposed to be --user-group --- .setup/ansible/roles/submitty_course_add_user/tasks/main.yml | 2 +- .setup/ansible/roles/submitty_course_creation/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml index 01528804749..d9ebbd95d1f 100644 --- a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml @@ -20,7 +20,7 @@ cmd: ./adduser_course.py "{{ submitty_course_add_user_username }}" "{{ submitty_course_add_user_term }}" "{{ submitty_course_add_user_course }}" "{{ submitty_course_creation_registration_section }}" - "{{ submitty_course_add_user_user_group }}" + --user-group "{{ submitty_course_add_user_user_group }}" chdir: /usr/local/submitty/sbin/ register: add_user_result become: true diff --git a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml index af3e06fc9ad..0156ad3568d 100644 --- a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml @@ -111,7 +111,7 @@ cmd: ./adduser_course.py "{{ submitty_course_creation_username }}" "{{ submitty_course_creation_term }}" "{{ submitty_course_creation_course }}" "{{ submitty_course_creation_registration_section }}" - "{{ submitty_course_creation_user_group }}" + --user-group "{{ submitty_course_creation_user_group }}" chdir: /usr/local/submitty/sbin/ become: true become_user: root From 7cc29a3531e35d9f96eb5690e304d1f16124fcdd Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 19:48:16 -0800 Subject: [PATCH 05/21] supposed to be --user_group actually --- .setup/ansible/roles/submitty_course_add_user/tasks/main.yml | 2 +- .setup/ansible/roles/submitty_course_creation/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml index d9ebbd95d1f..1639294dcba 100644 --- a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml @@ -20,7 +20,7 @@ cmd: ./adduser_course.py "{{ submitty_course_add_user_username }}" "{{ submitty_course_add_user_term }}" "{{ submitty_course_add_user_course }}" "{{ submitty_course_creation_registration_section }}" - --user-group "{{ submitty_course_add_user_user_group }}" + --user_group "{{ submitty_course_add_user_user_group }}" chdir: /usr/local/submitty/sbin/ register: add_user_result become: true diff --git a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml index 0156ad3568d..7ced1fbf72d 100644 --- a/.setup/ansible/roles/submitty_course_creation/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_creation/tasks/main.yml @@ -111,7 +111,7 @@ cmd: ./adduser_course.py "{{ submitty_course_creation_username }}" "{{ submitty_course_creation_term }}" "{{ submitty_course_creation_course }}" "{{ submitty_course_creation_registration_section }}" - --user-group "{{ submitty_course_creation_user_group }}" + --user_group "{{ submitty_course_creation_user_group }}" chdir: /usr/local/submitty/sbin/ become: true become_user: root From 35f83ef7c3194ab4b76b26be75142763a9e9e841 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 20:08:06 -0800 Subject: [PATCH 06/21] Download error logs --- .github/workflows/submitty_ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/submitty_ci.yml b/.github/workflows/submitty_ci.yml index b179549a8b5..89ee28fced0 100644 --- a/.github/workflows/submitty_ci.yml +++ b/.github/workflows/submitty_ci.yml @@ -584,3 +584,9 @@ jobs: with: name: install-log path: /usr/local/submitty/install.log + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: npm-error + path: /home/runner/.npm/_logs From 8bf23a12ccf8055e4b36c13f62d5cf49b9c49d08 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 20:45:19 -0800 Subject: [PATCH 07/21] check file permissions --- .github/workflows/submitty_ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/submitty_ci.yml b/.github/workflows/submitty_ci.yml index 89ee28fced0..89996d9b188 100644 --- a/.github/workflows/submitty_ci.yml +++ b/.github/workflows/submitty_ci.yml @@ -571,7 +571,10 @@ jobs: ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - name: Validate image - run: curl --show-error --fail --include http://localhost/authentication/login + run: | + curl --show-error --fail --include http://localhost/authentication/login + ls -alF /usr/local/submitty/GIT_CHECKOUT/Submitty/site + ls -alF /usr/local/submitty/GIT_CHECKOUT/Submitty - name: Run Ansible cypress test uses: cypress-io/github-action@v6 with: From d3a1d36fcb6445dd32ab49743b47684a6263436f Mon Sep 17 00:00:00 2001 From: IDzyre Date: Wed, 3 Jul 2024 22:08:34 -0800 Subject: [PATCH 08/21] install npm --- .github/workflows/submitty_ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/submitty_ci.yml b/.github/workflows/submitty_ci.yml index 89996d9b188..a1b7a8d9777 100644 --- a/.github/workflows/submitty_ci.yml +++ b/.github/workflows/submitty_ci.yml @@ -570,11 +570,17 @@ jobs: cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml + + - name: Install node dependencies + working-directory: ${{env.SUBMITTY_REPOSITORY}}/site + run: | + npm install file-saver --save + npm install --production=false + - name: Validate image run: | curl --show-error --fail --include http://localhost/authentication/login - ls -alF /usr/local/submitty/GIT_CHECKOUT/Submitty/site - ls -alF /usr/local/submitty/GIT_CHECKOUT/Submitty + - name: Run Ansible cypress test uses: cypress-io/github-action@v6 with: @@ -582,6 +588,7 @@ jobs: spec: cypress/e2e/Cypress-Ansible/ansible-course.spec.js working-directory: ${{env.SUBMITTY_REPOSITORY}}/site browser: chrome + - uses: actions/upload-artifact@v4 if: failure() with: From a06356344ede1ec22a052604c8fa25ca1ef04d15 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Thu, 4 Jul 2024 13:56:47 -0800 Subject: [PATCH 09/21] try sudo? --- .github/workflows/submitty_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/submitty_ci.yml b/.github/workflows/submitty_ci.yml index a1b7a8d9777..d0efca98cab 100644 --- a/.github/workflows/submitty_ci.yml +++ b/.github/workflows/submitty_ci.yml @@ -574,8 +574,8 @@ jobs: - name: Install node dependencies working-directory: ${{env.SUBMITTY_REPOSITORY}}/site run: | - npm install file-saver --save - npm install --production=false + sudo npm install file-saver --save + sudo npm install --production=false - name: Validate image run: | From 56ef6bc725cf0bd8b5e6f1ac0149cd15165bd9cc Mon Sep 17 00:00:00 2001 From: IDzyre Date: Thu, 4 Jul 2024 14:19:32 -0800 Subject: [PATCH 10/21] try adding runner? --- .setup/ansible/playbooks/submitty_course_creation.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.setup/ansible/playbooks/submitty_course_creation.yml b/.setup/ansible/playbooks/submitty_course_creation.yml index 318bc9cd64e..77c1d9babc4 100644 --- a/.setup/ansible/playbooks/submitty_course_creation.yml +++ b/.setup/ansible/playbooks/submitty_course_creation.yml @@ -26,6 +26,16 @@ submitty_add_user_email: email submitty_add_user_password: instructor + - name: Add instructor + ansible.builtin.include_role: + name: submitty_add_user + vars: + submitty_add_user_username: runner + submitty_add_user_firstname: instructor + submitty_add_user_lastname: Quinn + submitty_add_user_email: email + submitty_add_user_password: instructor + - name: Course Creation ansible.builtin.include_role: name: submitty_course_creation From 19cce139bb510dc8ecf5e6a69e0684acfa7ef2a8 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Fri, 7 Mar 2025 11:23:38 -0300 Subject: [PATCH 11/21] Try CI --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3d1e3dd71b..95ce1563631 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -878,18 +878,16 @@ jobs: ssh -T localhost sudo systemctl start postgresql + - name: Install node dependencies + working-directory: ${{env.SUBMITTY_REPOSITORY}}/site + run: npm ci + - name: Run ansible script shell: bash run: | cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - - - name: Install node dependencies - working-directory: ${{env.SUBMITTY_REPOSITORY}}/site - run: | - sudo npm install file-saver --save - sudo npm install --production=false - name: Validate image run: | From 6ffdf31eec5f921d0f7ce09710e0fc8690bf72c3 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Fri, 7 Mar 2025 12:42:03 -0300 Subject: [PATCH 12/21] Fix folder locations --- .github/workflows/ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95ce1563631..5487a079a94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -869,6 +869,17 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + with: + path: SUBMITTY_CPY/ + - name: Copy Repo + run: | + # have to copy first, absolute paths not supported by actions/checkout@v4 + sudo mkdir -p ${SUBMITTY_INSTALL_DIR}/GIT_CHECKOUT/Submitty + sudo cp -R SUBMITTY_CPY/. ${SUBMITTY_INSTALL_DIR}/GIT_CHECKOUT/Submitty + sudo chmod -R a+rwx ${SUBMITTY_INSTALL_DIR} + sudo chmod -R a+rwx /tmp/ + shell: bash - name: Setup SSH shell: bash run: | From f9915deec31dc604a3b4cbb12781c63b5d0160ae Mon Sep 17 00:00:00 2001 From: IDzyre Date: Fri, 7 Mar 2025 17:39:32 -0300 Subject: [PATCH 13/21] Testing more --- .github/workflows/ci.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5487a079a94..aa7005db30c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -868,18 +868,6 @@ jobs: ansible-ci: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - path: SUBMITTY_CPY/ - - name: Copy Repo - run: | - # have to copy first, absolute paths not supported by actions/checkout@v4 - sudo mkdir -p ${SUBMITTY_INSTALL_DIR}/GIT_CHECKOUT/Submitty - sudo cp -R SUBMITTY_CPY/. ${SUBMITTY_INSTALL_DIR}/GIT_CHECKOUT/Submitty - sudo chmod -R a+rwx ${SUBMITTY_INSTALL_DIR} - sudo chmod -R a+rwx /tmp/ - shell: bash - name: Setup SSH shell: bash run: | @@ -889,16 +877,16 @@ jobs: ssh -T localhost sudo systemctl start postgresql - - name: Install node dependencies - working-directory: ${{env.SUBMITTY_REPOSITORY}}/site - run: npm ci - - name: Run ansible script shell: bash run: | cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml + - name: Install node dependencies + working-directory: ${SUBMITTY_REPOSITORY}/site + run: npm ci + - name: Validate image run: | @@ -909,7 +897,7 @@ jobs: with: config: baseUrl=http://localhost spec: cypress/e2e/Cypress-Ansible/ansible-course.spec.js - working-directory: ${{env.SUBMITTY_REPOSITORY}}/site + working-directory: ${SUBMITTY_REPOSITORY}/site browser: chrome - uses: actions/upload-artifact@v4 From f8426df4468f0e2f5c8fba7a6f587878cceae570 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Fri, 7 Mar 2025 17:42:21 -0300 Subject: [PATCH 14/21] Testing more --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa7005db30c..95ce1563631 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -868,6 +868,7 @@ jobs: ansible-ci: runs-on: ubuntu-22.04 steps: + - uses: actions/checkout@v4 - name: Setup SSH shell: bash run: | @@ -877,16 +878,16 @@ jobs: ssh -T localhost sudo systemctl start postgresql + - name: Install node dependencies + working-directory: ${{env.SUBMITTY_REPOSITORY}}/site + run: npm ci + - name: Run ansible script shell: bash run: | cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - - name: Install node dependencies - working-directory: ${SUBMITTY_REPOSITORY}/site - run: npm ci - - name: Validate image run: | @@ -897,7 +898,7 @@ jobs: with: config: baseUrl=http://localhost spec: cypress/e2e/Cypress-Ansible/ansible-course.spec.js - working-directory: ${SUBMITTY_REPOSITORY}/site + working-directory: ${{env.SUBMITTY_REPOSITORY}}/site browser: chrome - uses: actions/upload-artifact@v4 From 6d9636c57a204df10170c78de2d1bda6c984fa70 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Sat, 8 Mar 2025 00:04:56 -0300 Subject: [PATCH 15/21] Testing more --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95ce1563631..38f5f524bce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -878,16 +878,17 @@ jobs: ssh -T localhost sudo systemctl start postgresql - - name: Install node dependencies - working-directory: ${{env.SUBMITTY_REPOSITORY}}/site - run: npm ci - - name: Run ansible script shell: bash run: | cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml + + - name: Install node dependencies + working-directory: ${{env.SUBMITTY_REPOSITORY}}/site + run: | + npm ci - name: Validate image run: | From 0d5fff75e96d8a5fbb3669f1fdd3d101cbe6b5d1 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Mon, 10 Mar 2025 20:29:32 -0300 Subject: [PATCH 16/21] ASDSADAS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f5f524bce..a6f0ed20015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -888,7 +888,7 @@ jobs: - name: Install node dependencies working-directory: ${{env.SUBMITTY_REPOSITORY}}/site run: | - npm ci + sudo npm ci - name: Validate image run: | From b25dae5ded8b70a1a5a81ac772c7d28316a1e317 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Mon, 10 Mar 2025 20:45:59 -0300 Subject: [PATCH 17/21] ASDSADAS --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6f0ed20015..a0bdb8ca279 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -885,10 +885,16 @@ jobs: ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml + - name: Set perms + shell: bash + run: | + sudo chmod -R a+rwx ${SUBMITTY_INSTALL_DIR} + sudo chmod -R a+rwx /tmp/ + - name: Install node dependencies working-directory: ${{env.SUBMITTY_REPOSITORY}}/site run: | - sudo npm ci + npm ci - name: Validate image run: | From c95eb19eced7018ffcc751588a442ce1a0eae6de Mon Sep 17 00:00:00 2001 From: IDzyre Date: Tue, 11 Mar 2025 10:30:30 -0300 Subject: [PATCH 18/21] See what is in the folder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0bdb8ca279..72c5510d780 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -912,7 +912,7 @@ jobs: if: failure() with: name: install-log - path: /usr/local/submitty/install.log + path: /usr/local/submitty/GIT_CHECKOUT/Submitty/site/cypress - uses: actions/upload-artifact@v4 if: failure() From 669214f3bf157ced69bc0db504d818fb8df2f9e6 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Tue, 11 Mar 2025 10:51:26 -0300 Subject: [PATCH 19/21] Test checking out branch --- .github/workflows/ci.yml | 2 +- .setup/ansible/roles/submitty_install/defaults/main.yml | 1 + .setup/ansible/roles/submitty_install/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72c5510d780..e07a9a8effe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -882,7 +882,7 @@ jobs: shell: bash run: | cd .setup/ansible - ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_install.yml + ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner submitty_install_submitty_version=${{ github.head_ref }} submitty_install_github_url=https://github.com/${{ github.repository }}.git' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - name: Set perms diff --git a/.setup/ansible/roles/submitty_install/defaults/main.yml b/.setup/ansible/roles/submitty_install/defaults/main.yml index 84768b0513d..cd43b34c110 100644 --- a/.setup/ansible/roles/submitty_install/defaults/main.yml +++ b/.setup/ansible/roles/submitty_install/defaults/main.yml @@ -1,5 +1,6 @@ --- submitty_install_submitty_version: main +submitty_install_github_url: https://github.com/Submitty/Submitty.git submitty_install_db_host: localhost submitty_install_db_port: 5432 submitty_install_submitty_dbuser: submitty_dbuser diff --git a/.setup/ansible/roles/submitty_install/tasks/main.yml b/.setup/ansible/roles/submitty_install/tasks/main.yml index 3c9264aadee..cd77689b113 100644 --- a/.setup/ansible/roles/submitty_install/tasks/main.yml +++ b/.setup/ansible/roles/submitty_install/tasks/main.yml @@ -22,7 +22,7 @@ - name: Checkout specific version of the submitty git repo ansible.builtin.git: - repo: https://github.com/Submitty/Submitty.git + repo: "{{ submitty_install_github_url }}" dest: /usr/local/submitty/GIT_CHECKOUT/Submitty version: "{{ submitty_install_submitty_version }}" force: true From 459d45cfcdaf6c697623cd6db8a2c93e937152b8 Mon Sep 17 00:00:00 2001 From: IDzyre Date: Tue, 11 Mar 2025 11:32:25 -0300 Subject: [PATCH 20/21] linting --- .setup/ansible/roles/submitty_add_user/tasks/main.yml | 2 +- .../roles/submitty_course_add_user/defaults/main.yml | 2 +- .../ansible/roles/submitty_course_add_user/tasks/main.yml | 2 +- site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.setup/ansible/roles/submitty_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_add_user/tasks/main.yml index 28160147cf4..7a28eacc665 100644 --- a/.setup/ansible/roles/submitty_add_user/tasks/main.yml +++ b/.setup/ansible/roles/submitty_add_user/tasks/main.yml @@ -11,4 +11,4 @@ (?m)^User email: "{{ submitty_add_user_email }}" (?m)^User password: "{{ submitty_add_user_password }}" become: true - become_user: root \ No newline at end of file + become_user: root diff --git a/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml b/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml index 0254baf0807..3bb200a706f 100644 --- a/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/defaults/main.yml @@ -1,3 +1,3 @@ --- submitty_course_add_user_user_group: 4 -submitty_course_creation_registration_section: None \ No newline at end of file +submitty_course_add_user_registration_section: None diff --git a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml index 1639294dcba..02b292eae35 100644 --- a/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml +++ b/.setup/ansible/roles/submitty_course_add_user/tasks/main.yml @@ -19,7 +19,7 @@ ansible.builtin.command: cmd: ./adduser_course.py "{{ submitty_course_add_user_username }}" "{{ submitty_course_add_user_term }}" "{{ submitty_course_add_user_course }}" - "{{ submitty_course_creation_registration_section }}" + "{{ submitty_course_add_user_registration_section }}" --user_group "{{ submitty_course_add_user_user_group }}" chdir: /usr/local/submitty/sbin/ register: add_user_result diff --git a/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js b/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js index 70bf24b4bc7..9b40263e7f7 100644 --- a/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js +++ b/site/cypress/e2e/Cypress-Ansible/ansible-course.spec.js @@ -1,7 +1,6 @@ -describe('Testing Ansible Scripts', () => { - - it('should work', () => { +describe('Testing website when created by ansible scripts', () => { + it('Should be able to login and see the course', () => { cy.login('instructor'); cy.visit('term', 'course'); }); -}); \ No newline at end of file +}); From 54a1321f3f50c292f4c2aa048ded7506eeefc94a Mon Sep 17 00:00:00 2001 From: IDzyre Date: Tue, 11 Mar 2025 11:40:50 -0300 Subject: [PATCH 21/21] More linting --- .github/workflows/ci.yml | 12 ++++++------ .../roles/submitty_course_creation/defaults/main.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e07a9a8effe..df1fd8a3916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -884,7 +884,7 @@ jobs: cd .setup/ansible ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner submitty_install_submitty_version=${{ github.head_ref }} submitty_install_github_url=https://github.com/${{ github.repository }}.git' -i inventory/submitty playbooks/submitty_install.yml ansible-playbook --private-key /home/runner/.ssh/id_rsa -e 'ansible_user=runner' -i inventory/submitty playbooks/submitty_course_creation.yml - + - name: Set perms shell: bash run: | @@ -911,11 +911,11 @@ jobs: - uses: actions/upload-artifact@v4 if: failure() with: - name: install-log - path: /usr/local/submitty/GIT_CHECKOUT/Submitty/site/cypress - + name: Cypress-Ansible-Screenshots + path: ${{env.SUBMITTY_REPOSITORY}}/site/cypress/screenshots + - uses: actions/upload-artifact@v4 if: failure() with: - name: npm-error - path: /home/runner/.npm/_logs + name: Cypress-Ansible-Videos + path: ${{env.SUBMITTY_REPOSITORY}}/site/cypress/videos diff --git a/.setup/ansible/roles/submitty_course_creation/defaults/main.yml b/.setup/ansible/roles/submitty_course_creation/defaults/main.yml index c090f0af8c9..2d4fdf6d7ae 100644 --- a/.setup/ansible/roles/submitty_course_creation/defaults/main.yml +++ b/.setup/ansible/roles/submitty_course_creation/defaults/main.yml @@ -1,3 +1,3 @@ --- submitty_course_creation_user_group: 1 -submitty_course_creation_registration_section: None \ No newline at end of file +submitty_course_creation_registration_section: None