diff --git a/Makefile b/Makefile index 7ae3367c61fd3a684b5ec36d46887b999ebc97a3..967e37ba7f2573f7ebe55bc7fd0cc8a47ae0e51d 100644 --- a/Makefile +++ b/Makefile @@ -57,3 +57,12 @@ endif start-tunnel: sudo minikube tunnel + +release-autograde: + docker buildx build --platform linux/amd64,linux/arm64 --push -t autograde/autograde-service:1.1.0 autograde-service/ + +release-moodle: + docker buildx build --platform linux/amd64,linux/arm64 --push -t autograde/moodle:1.1.0 -f Dockerfile-moodle-with-autograde ./ + +release-submission-manager: + docker buildx build --platform linux/amd64,linux/arm64 --push -t autograde/submission-manager:1.1.0 autograde-submission-manager/ diff --git a/autograde-service/pom.xml b/autograde-service/pom.xml index 95b0e69667006113400748628c7df2a3d48241ec..6fb373ff956dc7726f8717f9dc65c64206335e6f 100644 --- a/autograde-service/pom.xml +++ b/autograde-service/pom.xml @@ -13,7 +13,7 @@ <!-- HR : Project definition--> <groupId>ch.epfl.autograde</groupId> <artifactId>autograde-service</artifactId> - <version>1.0.1-RC8</version> + <version>1.1.0</version> <name>autograde-service</name> <description> diff --git a/autograde-submission-manager/pom.xml b/autograde-submission-manager/pom.xml index 2f68f5af0c5a3de61c5fca2a64c4a44afe8d4403..a6b9679407dac991e90f622169e0bd1906d1f1e4 100644 --- a/autograde-submission-manager/pom.xml +++ b/autograde-submission-manager/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.epfl.autograde</groupId> <artifactId>autograde-submission-manager</artifactId> - <version>1.0.1-RC8</version> + <version>1.1.0</version> <properties> <maven.compiler.source>17</maven.compiler.source> diff --git a/k8s/deployments/EPFL/prod/config/autograde-service-configuration.env b/k8s/deployments/EPFL/prod/config/autograde-service-configuration.env index fe3032f6529379a0559be6296bc36340f29e0903..0df2fd2d7a9076bcc75c994a077e56998c453e78 100644 --- a/k8s/deployments/EPFL/prod/config/autograde-service-configuration.env +++ b/k8s/deployments/EPFL/prod/config/autograde-service-configuration.env @@ -1,5 +1,5 @@ AUTOGRADE_BASEURL=https://moodle-autograde.epfl.ch AUTOGRADE_JOBS_NAMESPACE=prod MOODLE_BASEURL=https://moodle.epfl.ch -AUTOGRADE_SUBMISSIONMANAGER=ic-registry.epfl.ch/autograde/autograde-submission-manager:1.0.1-RC8 +AUTOGRADE_SUBMISSIONMANAGER=autograde/submission-manager:1.1.0 GRADING_SERVICE_LOG_LEVEL=INFO \ No newline at end of file diff --git a/k8s/deployments/EPFL/prod/kustomization.yaml b/k8s/deployments/EPFL/prod/kustomization.yaml index b51922c26c4665a3a551cf1fd4195a9f20ac3f34..d0645bf3ba558c9d6e4a90b38b96cd0bab2adafb 100644 --- a/k8s/deployments/EPFL/prod/kustomization.yaml +++ b/k8s/deployments/EPFL/prod/kustomization.yaml @@ -9,8 +9,8 @@ resources: images: - name: autograde-service - newName: ic-registry.epfl.ch/autograde/autograde-service - newTag: 1.0.1-RC8 + newName: autograde/autograde-service + newTag: 1.1.0 configMapGenerator: - name: autograde-configuration diff --git a/k8s/deployments/EPFL/staging/config/autograde-service-configuration.env b/k8s/deployments/EPFL/staging/config/autograde-service-configuration.env index 12d485d4e8d033228079edfc6e91469d4c459a12..a912e6b8423a1ec7310bfde5dcb76a2e0bf2d753 100644 --- a/k8s/deployments/EPFL/staging/config/autograde-service-configuration.env +++ b/k8s/deployments/EPFL/staging/config/autograde-service-configuration.env @@ -1,5 +1,5 @@ AUTOGRADE_BASEURL=https://moodle-autograde.epfl.ch/staging-epfl AUTOGRADE_JOBS_NAMESPACE=staging-epfl MOODLE_BASEURL=https://test-moodle.epfl.ch -AUTOGRADE_SUBMISSIONMANAGER=ic-registry.epfl.ch/autograde/autograde-submission-manager:1.0.1-RC8 +AUTOGRADE_SUBMISSIONMANAGER=autograde/submission-manager:1.1.0 GRADING_SERVICE_LOG_LEVEL=INFO \ No newline at end of file diff --git a/k8s/deployments/EPFL/staging/kustomization.yaml b/k8s/deployments/EPFL/staging/kustomization.yaml index 00288eaf962c7fbe11f0e4469d28d9ca8fceeeb9..128c6eec78c0c870ffaf63f33e4df7b88c2524b6 100644 --- a/k8s/deployments/EPFL/staging/kustomization.yaml +++ b/k8s/deployments/EPFL/staging/kustomization.yaml @@ -10,8 +10,8 @@ resources: # Configuration of the images images: - name: autograde-service - newName: ic-registry.epfl.ch/autograde/autograde-service - newTag: 1.0.1-RC8 + newName: autograde/autograde-service + newTag: 1.1.0 configMapGenerator: - name: autograde-configuration diff --git a/k8s/deployments/local/config/autograde-service-configuration.env b/k8s/deployments/local/config/autograde-service-configuration.env index 2010ff5fed3cd050d585a7dc9c08dfebd063d351..fb92b82503a7295726c28cd882bbadb3605db788 100644 --- a/k8s/deployments/local/config/autograde-service-configuration.env +++ b/k8s/deployments/local/config/autograde-service-configuration.env @@ -1,5 +1,5 @@ AUTOGRADE_BASEURL=http://autograde-service:8082 AUTOGRADE_JOB_NAMESPACE=default AUTOGRADE_MOODLE_BASEURL=http://moodle:80 -AUTOGRADE_MANAGER_IMAGE=ic-registry.epfl.ch/autograde/autograde-submission-manager:latest-dev +AUTOGRADE_MANAGER_IMAGE=autograde/submission-manager:latest-dev GRADING_SERVICE_LOG_LEVEL=INFO diff --git a/k8s/deployments/local/kustomization.yaml b/k8s/deployments/local/kustomization.yaml index 55376f0a24c7f0337e367438f31449505ab169f9..9b962d6b22a260b1e1ef4d650db53f029ccb48c2 100644 --- a/k8s/deployments/local/kustomization.yaml +++ b/k8s/deployments/local/kustomization.yaml @@ -7,10 +7,10 @@ resources: images: - name: autograde-service - newName: ic-registry.epfl.ch/autograde/autograde-service + newName: autograde/autograde-service newTag: latest-dev - name: moodle-with-autograde - newName: ic-registry.epfl.ch/autograde/moodle-with-autograde + newName: autograde/moodle newTag: latest-dev configMapGenerator: diff --git a/k8s/deployments/local/secrets/autograde-service-secrets.env b/k8s/deployments/local/secrets/autograde-service-secrets.env index 88b888b11dcd326f303c95e558dbb483a3646c2e..e88e21741ec771f46775367c5f3ea0ef79b38c3f 100644 --- a/k8s/deployments/local/secrets/autograde-service-secrets.env +++ b/k8s/deployments/local/secrets/autograde-service-secrets.env @@ -1,3 +1,3 @@ AUTOGRADE_API_KEY=12345 AUTOGRADE_INTEGRITY_SECRET=2t8gq0uDU(hWad*28YcAPp1!#K[Kqd;ZKv9%3R8(yKdkmA:ZwByBV<VMc+1>wqdB -AUTOGRADE_MOODLE_TOKEN=95407af5bc97060caa1253997760cd37 +AUTOGRADE_MOODLE_TOKEN=e0f00bd708d2359f4ab83ffc2254f086 diff --git a/moodle-assignsubmission-autograde/version.php b/moodle-assignsubmission-autograde/version.php index 48db0120f30473c6b1231ab673e30c4bda1cf50d..c0f03c5a671c2feb3ccdc77e1d3efad05b849101 100644 --- a/moodle-assignsubmission-autograde/version.php +++ b/moodle-assignsubmission-autograde/version.php @@ -25,10 +25,10 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2023121706; // HR : December 17th, 2023 +$plugin->version = 2024083000; // HR : August 30th, 2024 $plugin->requires = 2022112800; // HR : Moodle 4.1.0 (https://moodledev.io/general/releases#moodle-41-lts) $plugin->maturity = MATURITY_RC; -$plugin->release = '1.0.1-RC8'; +$plugin->release = '1.1.0'; $plugin->component = 'assignsubmission_autograde'; $plugin->dependencies = array( 'mod_assign' => '2022112800', diff --git a/pom.xml b/pom.xml index 4b85bad78107ed37ce6e1e1d23b001d487b51d92..8caffe0b0b0d3681823a8befe363d981a1157ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <!-- HR : Project definition--> <groupId>ch.epfl.autograde</groupId> <artifactId>autograde</artifactId> - <version>1.0.1-RC8</version> + <version>1.1.0</version> <name>autograde</name> <packaging>pom</packaging>