From 7546389af4847add7fca79b8edf35cc843378c5e Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.dev>
Date: Fri, 30 Aug 2024 14:12:01 +0200
Subject: [PATCH] Bump to 1.1.0
---
Makefile | 9 +++++++++
autograde-service/pom.xml | 2 +-
autograde-submission-manager/pom.xml | 2 +-
.../EPFL/prod/config/autograde-service-configuration.env | 2 +-
k8s/deployments/EPFL/prod/kustomization.yaml | 4 ++--
.../staging/config/autograde-service-configuration.env | 2 +-
k8s/deployments/EPFL/staging/kustomization.yaml | 4 ++--
.../local/config/autograde-service-configuration.env | 2 +-
k8s/deployments/local/kustomization.yaml | 4 ++--
.../local/secrets/autograde-service-secrets.env | 2 +-
moodle-assignsubmission-autograde/version.php | 4 ++--
pom.xml | 2 +-
12 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 7ae3367c..967e37ba 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 95b0e696..6fb373ff 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 2f68f5af..a6b96794 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 fe3032f6..0df2fd2d 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 b51922c2..d0645bf3 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 12d485d4..a912e6b8 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 00288eaf..128c6eec 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 2010ff5f..fb92b825 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 55376f0a..9b962d6b 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 88b888b1..e88e2174 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 48db0120..c0f03c5a 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 4b85bad7..8caffe0b 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>
--
GitLab