Rename voms-aa VO into vo.2

italiangrid · Apr 29, 2024 · 6f12cb8 · 6f12cb8
1 parent f991f3a
commit 6f12cb8
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/voms-aa.ci.yml b/.github/workflows/voms-aa.ci.yml
@@ -107,7 +107,7 @@ jobs:
     continue-on-error: true
 
     env:
-      ROBOT_OPTIONS: --variable vo1:indigo-dc --variable vo1_host:voms-aa.test.example --variable vo1_issuer:/C=IT/O=IGI/CN=*.test.example --variable --variable vo2:vo.1 --variable vo2_host:voms.test.example --variable vo2_issuer:/C=IT/O=IGI/CN=*.test.example --exclude issue-723 --exclude issue-724 --exclude issue-726
+      ROBOT_OPTIONS: --variable vo1:vo.2 --variable vo1_host:voms-aa.test.example --variable vo1_issuer:/C=IT/O=IGI/CN=*.test.example --variable --variable vo2:vo.1 --variable vo2_host:voms.test.example --variable vo2_issuer:/C=IT/O=IGI/CN=*.test.example --exclude issue-723 --exclude issue-724 --exclude issue-726
 
     steps:
     - name: Checkout

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ $ docker compose --file docker-compose.ci.yml exec -T --workdir /scripts db bash
 Run the testsuite. Some variables will be overridden using the `ROBOT_OPTIONS` environment variable
 
 ```
-$ export ROBOT_OPTIONS="--variable vo1:indigo-dc --variable vo1_host:voms-aa.test.example --variable vo1_issuer:/C=IT/O=IGI/CN=*.test.example --variable --variable vo2:vo.1 --variable vo2_host:voms.test.example --variable vo2_issuer:/C=IT/O=IGI/CN=*.test.example"
+$ export ROBOT_OPTIONS="--variable vo1:vo.2 --variable vo1_host:voms-aa.test.example --variable vo1_issuer:/C=IT/O=IGI/CN=*.test.example --variable --variable vo2:vo.1 --variable vo2_host:voms.test.example --variable vo2_issuer:/C=IT/O=IGI/CN=*.test.example"
 $ docker compose --file docker-compose.ci.yml exec -T -e ROBOT_OPTIONS="${ROBOT_OPTIONS}" testsuite bash /scripts/ci-run-testsuite.sh
 ```
 

diff --git a/compose/assets/db/dump-indigo_dc.sql → compose/assets/db/dump-voms_vo_2.sql b/compose/assets/db/dump-indigo_dc.sql → compose/assets/db/dump-voms_vo_2.sql
@@ -1368,7 +1368,7 @@ CREATE TABLE `iam_group` (
 
 LOCK TABLES `iam_group` WRITE;
 /*!40000 ALTER TABLE `iam_group` DISABLE KEYS */;
-INSERT INTO `iam_group` VALUES (1,'2024-03-27 18:43:07','The production group','2024-03-27 18:43:07','Production','c617d586-54e6-411d-8e38-64967798fa8a',NULL,0),(2,'2024-03-27 18:43:07','The analysis group','2024-03-27 18:43:07','Analysis','6a384bcd-d4b3-4b7f-a2fe-7d897ada0dd1',NULL,0),(101,'2024-03-27 18:43:07','Test group-001','2024-03-27 18:43:07','Test-001','c617d586-54e6-411d-8e38-649677980001',NULL,0),(102,'2024-03-27 18:43:07','Test group-002','2024-03-27 18:43:07','Test-002','c617d586-54e6-411d-8e38-649677980002',NULL,0),(103,'2024-03-27 18:43:07','Test group-003','2024-03-27 18:43:07','Test-003','c617d586-54e6-411d-8e38-649677980003',NULL,0),(104,'2024-03-27 18:43:07','Test group-004','2024-03-27 18:43:07','Test-004','c617d586-54e6-411d-8e38-649677980004',NULL,0),(105,'2024-03-27 18:43:07','Test group-005','2024-03-27 18:43:07','Test-005','c617d586-54e6-411d-8e38-649677980005',NULL,0),(106,'2024-03-27 18:43:07','Test group-006','2024-03-27 18:43:07','Test-006','c617d586-54e6-411d-8e38-649677980006',NULL,0),(107,'2024-03-27 18:43:07','Test group-007','2024-03-27 18:43:07','Test-007','c617d586-54e6-411d-8e38-649677980007',NULL,0),(108,'2024-03-27 18:43:07','Test group-008','2024-03-27 18:43:07','Test-008','c617d586-54e6-411d-8e38-649677980008',NULL,0),(109,'2024-03-27 18:43:07','Test group-009','2024-03-27 18:43:07','Test-009','c617d586-54e6-411d-8e38-649677980009',NULL,0),(110,'2024-03-27 18:43:07','Test group-010','2024-03-27 18:43:07','Test-010','c617d586-54e6-411d-8e38-649677980010',NULL,0),(111,'2024-03-27 18:43:07','Test group-011','2024-03-27 18:43:07','Test-011','c617d586-54e6-411d-8e38-649677980011',NULL,0),(112,'2024-03-27 18:43:07','Test group-012','2024-03-27 18:43:07','Test-012','c617d586-54e6-411d-8e38-649677980012',NULL,0),(113,'2024-03-27 18:43:07','Test group-013','2024-03-27 18:43:07','Test-013','c617d586-54e6-411d-8e38-649677980013',NULL,0),(114,'2024-03-27 18:43:07','Test group-014','2024-03-27 18:43:07','Test-014','c617d586-54e6-411d-8e38-649677980014',NULL,0),(115,'2024-03-27 18:43:07','Test group-015','2024-03-27 18:43:07','Test-015','c617d586-54e6-411d-8e38-649677980015',NULL,0),(116,'2024-03-27 18:43:07','Test group-016','2024-03-27 18:43:07','Test-016','c617d586-54e6-411d-8e38-649677980016',NULL,0),(117,'2024-03-27 18:43:07','Test group-017','2024-03-27 18:43:07','Test-017','c617d586-54e6-411d-8e38-649677980017',NULL,0),(118,'2024-03-27 18:43:07','Test group-018','2024-03-27 18:43:07','Test-018','c617d586-54e6-411d-8e38-649677980018',NULL,0),(119,'2024-03-27 18:43:07','Test group-019','2024-03-27 18:43:07','Test-019','c617d586-54e6-411d-8e38-649677980019',NULL,0),(120,'2024-03-27 18:43:07','Test group-020','2024-03-27 18:43:07','Test-020','c617d586-54e6-411d-8e38-649677980020',NULL,0),(121,'2024-03-27 18:44:41',NULL,'2024-03-27 18:47:36','indigo-dc','728b82da-751a-46fe-a4c0-44391837991a',NULL,0),(122,'2024-03-27 18:44:54',NULL,'2024-03-27 18:47:36','indigo-dc/G1','28c111d8-4a0c-4969-8a80-64a9c406702d',121,0),(123,'2024-03-27 18:45:00',NULL,'2024-03-27 18:47:39','indigo-dc/G2','373a768a-daba-4b66-a47d-63458db9a087',121,0),(124,'2024-03-27 18:45:05',NULL,'2024-03-27 18:47:59','indigo-dc/R1','67ee6763-e914-4b5a-93d7-a9000bbfe1f9',121,0),(125,'2024-03-27 18:45:29',NULL,'2024-03-27 18:47:36','indigo-dc/G1/R1','3534a378-eaf2-46cb-9d6e-9fc761f5262f',122,0),(126,'2024-03-27 18:46:00',NULL,'2024-03-27 18:47:59','indigo-dc/G2/G3','85d573fd-cdbd-41fb-9eca-8dabc481ba1d',123,0),(127,'2024-03-27 18:46:20',NULL,'2024-03-27 18:50:13','indigo-dc/G2/R1','843f6b10-151c-4ea8-9123-686640b58dcb',123,0);
+INSERT INTO `iam_group` VALUES (1,'2024-03-27 18:43:07','The production group','2024-03-27 18:43:07','Production','c617d586-54e6-411d-8e38-64967798fa8a',NULL,0),(2,'2024-03-27 18:43:07','The analysis group','2024-03-27 18:43:07','Analysis','6a384bcd-d4b3-4b7f-a2fe-7d897ada0dd1',NULL,0),(101,'2024-03-27 18:43:07','Test group-001','2024-03-27 18:43:07','Test-001','c617d586-54e6-411d-8e38-649677980001',NULL,0),(102,'2024-03-27 18:43:07','Test group-002','2024-03-27 18:43:07','Test-002','c617d586-54e6-411d-8e38-649677980002',NULL,0),(103,'2024-03-27 18:43:07','Test group-003','2024-03-27 18:43:07','Test-003','c617d586-54e6-411d-8e38-649677980003',NULL,0),(104,'2024-03-27 18:43:07','Test group-004','2024-03-27 18:43:07','Test-004','c617d586-54e6-411d-8e38-649677980004',NULL,0),(105,'2024-03-27 18:43:07','Test group-005','2024-03-27 18:43:07','Test-005','c617d586-54e6-411d-8e38-649677980005',NULL,0),(106,'2024-03-27 18:43:07','Test group-006','2024-03-27 18:43:07','Test-006','c617d586-54e6-411d-8e38-649677980006',NULL,0),(107,'2024-03-27 18:43:07','Test group-007','2024-03-27 18:43:07','Test-007','c617d586-54e6-411d-8e38-649677980007',NULL,0),(108,'2024-03-27 18:43:07','Test group-008','2024-03-27 18:43:07','Test-008','c617d586-54e6-411d-8e38-649677980008',NULL,0),(109,'2024-03-27 18:43:07','Test group-009','2024-03-27 18:43:07','Test-009','c617d586-54e6-411d-8e38-649677980009',NULL,0),(110,'2024-03-27 18:43:07','Test group-010','2024-03-27 18:43:07','Test-010','c617d586-54e6-411d-8e38-649677980010',NULL,0),(111,'2024-03-27 18:43:07','Test group-011','2024-03-27 18:43:07','Test-011','c617d586-54e6-411d-8e38-649677980011',NULL,0),(112,'2024-03-27 18:43:07','Test group-012','2024-03-27 18:43:07','Test-012','c617d586-54e6-411d-8e38-649677980012',NULL,0),(113,'2024-03-27 18:43:07','Test group-013','2024-03-27 18:43:07','Test-013','c617d586-54e6-411d-8e38-649677980013',NULL,0),(114,'2024-03-27 18:43:07','Test group-014','2024-03-27 18:43:07','Test-014','c617d586-54e6-411d-8e38-649677980014',NULL,0),(115,'2024-03-27 18:43:07','Test group-015','2024-03-27 18:43:07','Test-015','c617d586-54e6-411d-8e38-649677980015',NULL,0),(116,'2024-03-27 18:43:07','Test group-016','2024-03-27 18:43:07','Test-016','c617d586-54e6-411d-8e38-649677980016',NULL,0),(117,'2024-03-27 18:43:07','Test group-017','2024-03-27 18:43:07','Test-017','c617d586-54e6-411d-8e38-649677980017',NULL,0),(118,'2024-03-27 18:43:07','Test group-018','2024-03-27 18:43:07','Test-018','c617d586-54e6-411d-8e38-649677980018',NULL,0),(119,'2024-03-27 18:43:07','Test group-019','2024-03-27 18:43:07','Test-019','c617d586-54e6-411d-8e38-649677980019',NULL,0),(120,'2024-03-27 18:43:07','Test group-020','2024-03-27 18:43:07','Test-020','c617d586-54e6-411d-8e38-649677980020',NULL,0),(121,'2024-03-27 18:44:41',NULL,'2024-03-27 18:47:36','vo.2','728b82da-751a-46fe-a4c0-44391837991a',NULL,0),(122,'2024-03-27 18:44:54',NULL,'2024-03-27 18:47:36','vo.2/G1','28c111d8-4a0c-4969-8a80-64a9c406702d',121,0),(123,'2024-03-27 18:45:00',NULL,'2024-03-27 18:47:39','vo.2/G2','373a768a-daba-4b66-a47d-63458db9a087',121,0),(124,'2024-03-27 18:45:05',NULL,'2024-03-27 18:47:59','vo.2/R1','67ee6763-e914-4b5a-93d7-a9000bbfe1f9',121,0),(125,'2024-03-27 18:45:29',NULL,'2024-03-27 18:47:36','vo.2/G1/R1','3534a378-eaf2-46cb-9d6e-9fc761f5262f',122,0),(126,'2024-03-27 18:46:00',NULL,'2024-03-27 18:47:59','vo.2/G2/G3','85d573fd-cdbd-41fb-9eca-8dabc481ba1d',123,0),(127,'2024-03-27 18:46:20',NULL,'2024-03-27 18:50:13','vo.2/G2/R1','843f6b10-151c-4ea8-9123-686640b58dcb',123,0);
 /*!40000 ALTER TABLE `iam_group` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/compose/assets/scripts/populate-db.sh b/compose/assets/scripts/populate-db.sh
@@ -27,16 +27,6 @@ for i in $(seq 0 ${VO_COUNT}); do
   load_db_dump $i
 done
 
-VO_NAME=indigo_dc
-dump_file=dump-${VO_NAME}.sql
-if [ -f ${SCRIPTS_PREFIX}/${dump_file} ]; then
-  echo "Loading dump file ${SCRIPTS_PREFIX}/${dump_file} for VO indigo-dc"
-  mysql -u root -p${MYSQL_ROOT_PASSWORD} -e "create database ${VO_NAME}"
-  cat ${SCRIPTS_PREFIX}/${dump_file} | mysql -u root -p${MYSQL_ROOT_PASSWORD} ${VO_NAME}
-else
-  echo "${dump_file} not found"
-fi
-
 mysql -p${MYSQL_ROOT_PASSWORD} -e "GRANT ALL PRIVILEGES ON *.* TO 'user'@'%'"
 
 echo "VOMS db has been populated !"

diff --git a/compose/assets/vomsaa/application-mysql-test.yml b/compose/assets/vomsaa/application-mysql-test.yml
@@ -32,6 +32,6 @@ voms:
   aa:
     host: voms-aa.test.example
     port: ${server.port}
-    vo-name: indigo-dc
+    vo-name: vo.2
     optional-group-label: voms.role
     use-legacy-fqan-encoding: true
diff --git a/...omsdir/indigo-dc/voms-aa.test.example.lsc → ...ets/vomsdir/vo.2/voms-aa.test.example.lsc b/...omsdir/indigo-dc/voms-aa.test.example.lsc → ...ets/vomsdir/vo.2/voms-aa.test.example.lsc
diff --git a/compose/assets/vomses/indigo-dc b/compose/assets/vomses/indigo-dc
diff --git a/compose/assets/vomses/vo.2.vomses b/compose/assets/vomses/vo.2.vomses
@@ -0,0 +1 @@
+"vo.2" "voms-aa.test.example" "443" "/C=IT/O=IGI/CN=*.test.example" "vo.2"
diff --git a/compose/docker-compose.ci.yml b/compose/docker-compose.ci.yml
@@ -115,7 +115,7 @@ services:
       TZ: Europe/Rome
       JAVA_DEBUG_OPTS: -Djava.security.egd=file:/dev/./urandom -agentlib:jdwp=server=y,transport=dt_socket,suspend=n,address=1044
       JAVA_OPTS: -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=mysql-test
-      IAM_DB_NAME: indigo_dc
+      IAM_DB_NAME: vo_2
       IAM_DB_USERNAME: user
 
     ports:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		"vo.2" "voms-aa.test.example" "443" "/C=IT/O=IGI/CN=*.test.example" "vo.2"